rivetkit 2.1.5 → 2.1.6-rc.1

package/dist/tsup/{chunk-OAXJWGMU.cjs → chunk-VBR35EQF.cjs}

@@ -2,10 +2,11 @@
 
 
 
+var _chunk2LY7RW3Ycjs = require('./chunk-2LY7RW3Y.cjs');
 
 
 
-var _chunkU5SMSA27cjs = require('./chunk-U5SMSA27.cjs');
+var _chunkJJNZQDUNcjs = require('./chunk-JJNZQDUN.cjs');
 
 
 
@@ -13,10 +14,10 @@ var _chunkU5SMSA27cjs = require('./chunk-U5SMSA27.cjs');
 
 
 
+var _chunkGUHXWPGBcjs = require('./chunk-GUHXWPGB.cjs');
 
 
 
-var _chunkIIJNPVPQcjs = require('./chunk-IIJNPVPQ.cjs');
 
 
 
@@ -30,6 +31,7 @@ var _chunkIIJNPVPQcjs = require('./chunk-IIJNPVPQ.cjs');
 
 
 
+var _chunkCGGGBIDPcjs = require('./chunk-CGGGBIDP.cjs');
 
 
 
@@ -47,48 +49,28 @@ var _chunkIIJNPVPQcjs = require('./chunk-IIJNPVPQ.cjs');
 
 
 
+var _chunkHNE2AK6Ccjs = require('./chunk-HNE2AK6C.cjs');
 
-var _chunkTI5PXQGGcjs = require('./chunk-TI5PXQGG.cjs');
 
 
+var _chunkA4KEUCB6cjs = require('./chunk-A4KEUCB6.cjs');
 
 
 
 
-var _chunkPB5AEMKQcjs = require('./chunk-PB5AEMKQ.cjs');
 
 
 
 
 
 
+var _chunkMPLMTJY5cjs = require('./chunk-MPLMTJY5.cjs');
 
 
 
 
 
-
-
-
-
-
-
-
-var _chunkHYPIHCDTcjs = require('./chunk-HYPIHCDT.cjs');
-
-
-
-
-
-var _chunkL47L3ZWJcjs = require('./chunk-L47L3ZWJ.cjs');
-
-// src/actor/mod.ts
-function actor(input) {
-  const config = _chunkPB5AEMKQcjs.ActorConfigSchema.parse(input);
-  return new (0, _chunkU5SMSA27cjs.ActorDefinition)(config);
-}
-var event2 = _chunkPB5AEMKQcjs.event;
-var queue2 = _chunkPB5AEMKQcjs.queue;
+var _chunk6G7ZNM27cjs = require('./chunk-6G7ZNM27.cjs');
 
 // src/drivers/engine/actor-driver.ts
 var _enginerunner = require('@rivetkit/engine-runner');
@@ -99,7 +81,7 @@ var _invariant = require('invariant'); var _invariant2 = _interopRequireDefault(
 
 // src/drivers/engine/log.ts
 function logger2() {
-  return _chunkHYPIHCDTcjs.getLogger.call(void 0, "driver-engine");
+  return _chunkMPLMTJY5cjs.getLogger.call(void 0, "driver-engine");
 }
 
 // src/drivers/engine/actor-driver.ts
@@ -114,8 +96,19 @@ var EngineActorDriver = class {
   #runner;
   #actors = /* @__PURE__ */ new Map();
   #actorRouter;
-  #runnerStarted = _chunkHYPIHCDTcjs.promiseWithResolvers.call(void 0, (reason) => logger2().warn({ msg: "unhandled runner started promise rejection", reason }));
-  #runnerStopped = _chunkHYPIHCDTcjs.promiseWithResolvers.call(void 0, (reason) => logger2().warn({ msg: "unhandled runner stopped promise rejection", reason }));
+  #sqlitePool;
+  #runnerStarted = _chunkMPLMTJY5cjs.promiseWithResolvers.call(void 0, 
+    (reason) => logger2().warn({
+      msg: "unhandled runner started promise rejection",
+      reason
+    })
+  );
+  #runnerStopped = _chunkMPLMTJY5cjs.promiseWithResolvers.call(void 0, 
+    (reason) => logger2().warn({
+      msg: "unhandled runner stopped promise rejection",
+      reason
+    })
+  );
   #isRunnerStopped = false;
   // HACK: Track actor stop intent locally since the runner protocol doesn't
   // pass the stop reason to onActorStop. This will be fixed when the runner
@@ -138,8 +131,9 @@ var EngineActorDriver = class {
     this.#config = config;
     this.#managerDriver = managerDriver;
     this.#inlineClient = inlineClient;
+    this.#sqlitePool = new (0, _chunkCGGGBIDPcjs.SqliteVfsPoolManager)(config);
     const token = config.token;
-    this.#actorRouter = _chunkU5SMSA27cjs.createActorRouter.call(void 0, 
+    this.#actorRouter = _chunkJJNZQDUNcjs.createActorRouter.call(void 0, 
       config,
       this,
       void 0,
@@ -147,16 +141,15 @@ var EngineActorDriver = class {
     );
     const engineRunnerConfig = {
       version: config.runner.version,
-      endpoint: _chunkIIJNPVPQcjs.getEndpoint.call(void 0, config),
+      endpoint: _chunkGUHXWPGBcjs.getEndpoint.call(void 0, config),
       token,
       namespace: config.namespace,
       totalSlots: config.runner.totalSlots,
       runnerName: config.runner.runnerName,
-      runnerKey: _nullishCoalesce(config.runner.runnerKey, () => ( crypto.randomUUID())),
       metadata: {
-        rivetkit: { version: _chunkHYPIHCDTcjs.VERSION }
+        rivetkit: { version: _chunkMPLMTJY5cjs.VERSION }
       },
-      prepopulateActorNames: _chunkTI5PXQGGcjs.buildActorNames.call(void 0, config),
+      prepopulateActorNames: _chunkHNE2AK6Ccjs.buildActorNames.call(void 0, config),
       onConnected: () => {
         this.#runnerStarted.resolve(void 0);
       },
@@ -173,7 +166,8 @@ var EngineActorDriver = class {
       },
       onActorStart: this.#runnerOnActorStart.bind(this),
       onActorStop: this.#runnerOnActorStop.bind(this),
-      logger: _chunkHYPIHCDTcjs.getLogger.call(void 0, "engine-runner")
+      logger: _chunkMPLMTJY5cjs.getLogger.call(void 0, "engine-runner"),
+      debugLatencyMs: process.env._RIVET_DEBUG_LATENCY_MS ? Number.parseInt(process.env._RIVET_DEBUG_LATENCY_MS, 10) : void 0
     };
     this.#runner = new (0, _enginerunner.Runner)(engineRunnerConfig);
     this.#runner.start();
@@ -199,8 +193,8 @@ var EngineActorDriver = class {
   getContext(actorId) {
     return {};
   }
-  async setAlarm(actor2, timestamp) {
-    const handler = this.#actors.get(actor2.id);
+  async setAlarm(actor, timestamp) {
+    const handler = this.#actors.get(actor.id);
     if (!handler) {
       logger2().warn({
         msg: "no handler for actor to set alarm"
@@ -212,11 +206,11 @@ var EngineActorDriver = class {
       handler.alarmTimeout = void 0;
     }
     const delay = Math.max(0, timestamp - Date.now());
-    handler.alarmTimeout = _chunkHYPIHCDTcjs.setLongTimeout.call(void 0, () => {
-      actor2.onAlarm();
+    handler.alarmTimeout = _chunkMPLMTJY5cjs.setLongTimeout.call(void 0, () => {
+      actor.onAlarm();
       handler.alarmTimeout = void 0;
     }, delay);
-    this.#runner.setAlarm(actor2.id, timestamp);
+    this.#runner.setAlarm(actor.id, timestamp);
   }
   // No database overrides - will use KV-backed implementation from rivetkit/db
   // MARK: - Batch KV operations
@@ -229,6 +223,9 @@ var EngineActorDriver = class {
   async kvBatchDelete(actorId, keys) {
     await this.#runner.kvDelete(actorId, keys);
   }
+  async kvDeleteRange(actorId, start, end) {
+    await this.#runner.kvDeleteRange(actorId, start, end);
+  }
   async kvList(actorId) {
     const entries = await this.#runner.kvListPrefix(
       actorId,
@@ -243,8 +240,12 @@ var EngineActorDriver = class {
     });
     return keys;
   }
-  async kvListPrefix(actorId, prefix) {
-    const result = await this.#runner.kvListPrefix(actorId, prefix);
+  async kvListPrefix(actorId, prefix, options) {
+    const result = await this.#runner.kvListPrefix(
+      actorId,
+      prefix,
+      options
+    );
     logger2().info({
       msg: "kvListPrefix called",
       actorId,
@@ -254,11 +255,18 @@ var EngineActorDriver = class {
     });
     return result;
   }
+  async kvListRange(actorId, start, end, options) {
+    return await this.#runner.kvListRange(
+      actorId,
+      start,
+      end,
+      true,
+      options
+    );
+  }
   /** Creates a SQLite VFS instance for creating KV-backed databases */
-  async createSqliteVfs() {
-    const specifier = "@rivetkit/sqlite-vfs";
-    const { SqliteVfs } = await Promise.resolve().then(() => _interopRequireWildcard(require(specifier)));
-    return new SqliteVfs();
+  async createSqliteVfs(actorId) {
+    return await this.#sqlitePool.acquire(actorId);
   }
   // MARK: - Actor Lifecycle
   async loadActor(actorId) {
@@ -288,7 +296,7 @@ var EngineActorDriver = class {
             var _a;
             (_a = handler.actor) == null ? void 0 : _a.rLog.error({
               msg: "onStop errored",
-              error: _chunkHYPIHCDTcjs.stringifyError.call(void 0, err)
+              error: _chunkMPLMTJY5cjs.stringifyError.call(void 0, err)
             });
           })
         );
@@ -296,6 +304,7 @@ var EngineActorDriver = class {
     }
     await Promise.all(stopPromises);
     logger2().debug({ msg: "all actors stopped" });
+    await this.#sqlitePool.shutdown();
     try {
       await this.#runner.shutdown(immediate);
     } catch (error) {
@@ -371,20 +380,25 @@ var EngineActorDriver = class {
     let handler = this.#actors.get(actorId);
     if (!handler) {
       handler = {
-        actorStartPromise: _chunkHYPIHCDTcjs.promiseWithResolvers.call(void 0, (reason) => logger2().warn({ msg: "unhandled actor start promise rejection", reason }))
+        actorStartPromise: _chunkMPLMTJY5cjs.promiseWithResolvers.call(void 0, 
+          (reason) => logger2().warn({
+            msg: "unhandled actor start promise rejection",
+            reason
+          })
+        )
       };
       this.#actors.set(actorId, handler);
     }
     handler.actorStartError = void 0;
     const name = actorConfig.name;
     _invariant2.default.call(void 0, actorConfig.key, "actor should have a key");
-    const key = _chunkTI5PXQGGcjs.deserializeActorKey.call(void 0, actorConfig.key);
+    const key = _chunkHNE2AK6Ccjs.deserializeActorKey.call(void 0, actorConfig.key);
     try {
       const [persistDataBuffer] = await this.#runner.kvGet(actorId, [
-        _chunkPB5AEMKQcjs.KEYS.PERSIST_DATA
+        _chunkA4KEUCB6cjs.KEYS.PERSIST_DATA
       ]);
       if (persistDataBuffer === null) {
-        const initialKvState = _chunkTI5PXQGGcjs.getInitialActorKvState.call(void 0, input);
+        const initialKvState = _chunkCGGGBIDPcjs.getInitialActorKvState.call(void 0, input);
         await this.#runner.kvPut(actorId, initialKvState);
         logger2().debug({
           msg: "initialized persist data for new actor",
@@ -397,7 +411,7 @@ var EngineActorDriver = class {
           dataSize: persistDataBuffer.byteLength
         });
       }
-      const definition = _chunkU5SMSA27cjs.lookupInRegistry.call(void 0, this.#config, actorConfig.name);
+      const definition = _chunkJJNZQDUNcjs.lookupInRegistry.call(void 0, this.#config, actorConfig.name);
       handler.actor = await definition.instantiate();
       const protocolMetadata = this.#runner.getProtocolMetadata();
       if (protocolMetadata) {
@@ -405,11 +419,17 @@ var EngineActorDriver = class {
           msg: "applying config limits from protocol",
           protocolMetadata
         });
-        const stopThresholdMax = Math.max(Number(protocolMetadata.actorStopThreshold) - 1e3, 0);
+        const stopThresholdMax = Math.max(
+          Number(protocolMetadata.actorStopThreshold) - 1e3,
+          0
+        );
         handler.actor.overrides.onSleepTimeout = stopThresholdMax;
         handler.actor.overrides.onDestroyTimeout = stopThresholdMax;
         if (protocolMetadata.serverlessDrainGracePeriod) {
-          const drainMax = Math.max(Number(protocolMetadata.serverlessDrainGracePeriod) - 1e3, 0);
+          const drainMax = Math.max(
+            Number(protocolMetadata.serverlessDrainGracePeriod) - 1e3,
+            0
+          );
           handler.actor.overrides.runStopTimeout = drainMax;
           handler.actor.overrides.waitUntilTimeout = drainMax;
         }
@@ -428,7 +448,9 @@ var EngineActorDriver = class {
       const error = innerError instanceof Error ? new Error(
         `Failed to start actor ${actorId}: ${innerError.message}`,
         { cause: innerError }
-      ) : new Error(`Failed to start actor ${actorId}: ${String(innerError)}`);
+      ) : new Error(
+        `Failed to start actor ${actorId}: ${String(innerError)}`
+      );
       handler.actor = void 0;
       handler.actorStartError = error;
       (_a = handler.actorStartPromise) == null ? void 0 : _a.reject(error);
@@ -438,7 +460,7 @@ var EngineActorDriver = class {
         actorId,
         name,
         key,
-        err: _chunkHYPIHCDTcjs.stringifyError.call(void 0, error)
+        err: _chunkMPLMTJY5cjs.stringifyError.call(void 0, error)
       });
       try {
         this.#runner.stopActor(actorId);
@@ -446,7 +468,7 @@ var EngineActorDriver = class {
         logger2().debug({
           msg: "failed to stop actor after start failure",
           actorId,
-          err: _chunkHYPIHCDTcjs.stringifyError.call(void 0, stopError)
+          err: _chunkMPLMTJY5cjs.stringifyError.call(void 0, stopError)
         });
       }
     }
@@ -457,18 +479,26 @@ var EngineActorDriver = class {
     this.#actorStopIntent.delete(actorId);
     const handler = this.#actors.get(actorId);
     if (!handler) {
-      logger2().debug({ msg: "no runner actor handler to stop", actorId, reason });
+      logger2().debug({
+        msg: "no runner actor handler to stop",
+        actorId,
+        reason
+      });
       return;
     }
     if (handler.actorStartPromise) {
       try {
-        logger2().debug({ msg: "runner actor stopping before it started, waiting", actorId, generation });
+        logger2().debug({
+          msg: "runner actor stopping before it started, waiting",
+          actorId,
+          generation
+        });
         await handler.actorStartPromise.promise;
       } catch (err) {
         logger2().debug({
           msg: "actor start failed during stop, cleaning up handler",
           actorId,
-          err: _chunkHYPIHCDTcjs.stringifyError.call(void 0, err)
+          err: _chunkMPLMTJY5cjs.stringifyError.call(void 0, err)
         });
       }
     }
@@ -478,7 +508,7 @@ var EngineActorDriver = class {
       } catch (err) {
         logger2().error({
           msg: "error in onStop, proceeding with removing actor",
-          err: _chunkHYPIHCDTcjs.stringifyError.call(void 0, err)
+          err: _chunkMPLMTJY5cjs.stringifyError.call(void 0, err)
         });
       }
     }
@@ -511,10 +541,10 @@ var EngineActorDriver = class {
       websocketProps: websocketRaw ? Object.keys(websocketRaw).join(", ") : "null"
     });
     const protocols = request.headers.get("sec-websocket-protocol");
-    const { encoding, connParams } = _chunkTI5PXQGGcjs.parseWebSocketProtocols.call(void 0, protocols);
+    const { encoding, connParams } = _chunkHNE2AK6Ccjs.parseWebSocketProtocols.call(void 0, protocols);
     let wsHandler;
     try {
-      wsHandler = await _chunkTI5PXQGGcjs.routeWebSocket.call(void 0, 
+      wsHandler = await _chunkHNE2AK6Ccjs.routeWebSocket.call(void 0, 
         request,
         requestPath,
         requestHeaders,
@@ -536,8 +566,8 @@ var EngineActorDriver = class {
     websocket.raw = websocket;
     const wsContext = new (0, _ws.WSContext)(websocket);
     const conn = wsHandler.conn;
-    const actor2 = wsHandler.actor;
-    const connStateManager = conn == null ? void 0 : conn[_chunkTI5PXQGGcjs.CONN_STATE_MANAGER_SYMBOL];
+    const actor = wsHandler.actor;
+    const connStateManager = conn == null ? void 0 : conn[_chunkHNE2AK6Ccjs.CONN_STATE_MANAGER_SYMBOL];
     logger2().debug({
       msg: "attaching websocket event listeners",
       actorId,
@@ -549,79 +579,79 @@ var EngineActorDriver = class {
     if (isRestoringHibernatable) {
       (_c = wsHandler.onRestore) == null ? void 0 : _c.call(wsHandler, wsContext);
     }
-    websocket.addEventListener("open", (event3) => {
-      wsHandler.onOpen(event3, wsContext);
+    websocket.addEventListener("open", (event) => {
+      wsHandler.onOpen(event, wsContext);
     });
-    websocket.addEventListener("message", (event3) => {
+    websocket.addEventListener("message", (event) => {
       var _a2, _b2;
       logger2().debug({
         msg: "websocket message event listener triggered",
         connId: conn == null ? void 0 : conn.id,
-        actorId: actor2 == null ? void 0 : actor2.id,
-        messageIndex: event3.rivetMessageIndex,
+        actorId: actor == null ? void 0 : actor.id,
+        messageIndex: event.rivetMessageIndex,
         hasWsHandler: !!wsHandler,
         hasOnMessage: !!(wsHandler == null ? void 0 : wsHandler.onMessage),
-        actorIsStopping: actor2 == null ? void 0 : actor2.isStopping,
+        actorIsStopping: actor == null ? void 0 : actor.isStopping,
         websocketType: (_a2 = websocket == null ? void 0 : websocket.constructor) == null ? void 0 : _a2.name,
         wsUniqueId: websocket.__rivet_ws_id,
-        eventTargetWsId: (_b2 = event3.target) == null ? void 0 : _b2.__rivet_ws_id
+        eventTargetWsId: (_b2 = event.target) == null ? void 0 : _b2.__rivet_ws_id
       });
-      if (actor2 == null ? void 0 : actor2.isStopping) {
+      if (actor == null ? void 0 : actor.isStopping) {
         logger2().debug({
           msg: "ignoring ws message, actor is stopping",
           connId: conn == null ? void 0 : conn.id,
-          actorId: actor2 == null ? void 0 : actor2.id,
-          messageIndex: event3.rivetMessageIndex
+          actorId: actor == null ? void 0 : actor.id,
+          messageIndex: event.rivetMessageIndex
         });
         return;
       }
       logger2().debug({
         msg: "calling wsHandler.onMessage",
         connId: conn == null ? void 0 : conn.id,
-        messageIndex: event3.rivetMessageIndex
+        messageIndex: event.rivetMessageIndex
       });
-      wsHandler.onMessage(event3, wsContext);
+      wsHandler.onMessage(event, wsContext);
       const hibernate = connStateManager == null ? void 0 : connStateManager.hibernatableData;
-      if (hibernate && conn && actor2) {
+      if (hibernate && conn && actor) {
         _invariant2.default.call(void 0, 
-          typeof event3.rivetMessageIndex === "number",
+          typeof event.rivetMessageIndex === "number",
           "missing event.rivetMessageIndex"
         );
         const previousMsgIndex = hibernate.serverMessageIndex;
-        hibernate.serverMessageIndex = event3.rivetMessageIndex;
+        hibernate.serverMessageIndex = event.rivetMessageIndex;
         logger2().info({
           msg: "persisting message index",
           connId: conn.id,
           previousMsgIndex,
-          newMsgIndex: event3.rivetMessageIndex
+          newMsgIndex: event.rivetMessageIndex
         });
         const entry = this.#hwsMessageIndex.get(conn.id);
         if (entry) {
-          const messageLength = _chunkTI5PXQGGcjs.getValueLength.call(void 0, event3.data);
+          const messageLength = _chunkHNE2AK6Ccjs.getValueLength.call(void 0, event.data);
           entry.bufferedMessageSize += messageLength;
           if (entry.bufferedMessageSize >= CONN_BUFFERED_MESSAGE_SIZE_THRESHOLD) {
             entry.bufferedMessageSize = 0;
             entry.pendingAckFromBufferSize = true;
-            actor2.stateManager.saveState({
+            actor.stateManager.saveState({
               immediate: true
             });
           } else {
-            actor2.stateManager.saveState({
+            actor.stateManager.saveState({
               maxWait: CONN_MESSAGE_ACK_DEADLINE
             });
           }
         } else {
-          actor2.stateManager.saveState({
+          actor.stateManager.saveState({
             maxWait: CONN_MESSAGE_ACK_DEADLINE
           });
         }
       }
     });
-    websocket.addEventListener("close", (event3) => {
-      wsHandler.onClose(event3, wsContext);
+    websocket.addEventListener("close", (event) => {
+      wsHandler.onClose(event, wsContext);
     });
-    websocket.addEventListener("error", (event3) => {
-      wsHandler.onError(event3, wsContext);
+    websocket.addEventListener("error", (event) => {
+      wsHandler.onError(event, wsContext);
     });
     if (isRestoringHibernatable) {
       logger2().info({
@@ -668,10 +698,10 @@ var EngineActorDriver = class {
       gatewayId: _enginerunner.idToStr.call(void 0, gatewayId),
       requestId: _enginerunner.idToStr.call(void 0, requestId)
     });
-    if (path === _chunkTI5PXQGGcjs.PATH_CONNECT) {
+    if (path === _chunkHNE2AK6Ccjs.PATH_CONNECT) {
       return true;
-    } else if (path === _chunkTI5PXQGGcjs.PATH_WEBSOCKET_BASE || path.startsWith(_chunkTI5PXQGGcjs.PATH_WEBSOCKET_PREFIX)) {
-      const definition = _chunkU5SMSA27cjs.lookupInRegistry.call(void 0, 
+    } else if (path === _chunkHNE2AK6Ccjs.PATH_WEBSOCKET_BASE || path.startsWith(_chunkHNE2AK6Ccjs.PATH_WEBSOCKET_PREFIX)) {
+      const definition = _chunkJJNZQDUNcjs.lookupInRegistry.call(void 0, 
         this.#config,
         actorInstance.config.name
       );
@@ -680,7 +710,7 @@ var EngineActorDriver = class {
         return true;
       } else if (typeof canHibernateWebSocket === "function") {
         try {
-          const newPath = _chunkTI5PXQGGcjs.truncateRawWebSocketPathPrefix.call(void 0, 
+          const newPath = _chunkHNE2AK6Ccjs.truncateRawWebSocketPathPrefix.call(void 0, 
             url.pathname
           );
           const truncatedRequest = new Request(
@@ -699,7 +729,7 @@ var EngineActorDriver = class {
       } else {
         return false;
       }
-    } else if (path === _chunkTI5PXQGGcjs.PATH_INSPECTOR_CONNECT) {
+    } else if (path === _chunkHNE2AK6Ccjs.PATH_INSPECTOR_CONNECT) {
       return false;
     } else {
       logger2().warn({
@@ -710,9 +740,9 @@ var EngineActorDriver = class {
     }
   }
   async #hwsLoadAll(actorId) {
-    const actor2 = await this.loadActor(actorId);
-    return actor2.conns.values().map((conn) => {
-      const connStateManager = conn[_chunkTI5PXQGGcjs.CONN_STATE_MANAGER_SYMBOL];
+    const actor = await this.loadActor(actorId);
+    return actor.conns.values().map((conn) => {
+      const connStateManager = conn[_chunkHNE2AK6Ccjs.CONN_STATE_MANAGER_SYMBOL];
       const hibernatable = connStateManager.hibernatableData;
       if (!hibernatable) return void 0;
       return {
@@ -725,18 +755,18 @@ var EngineActorDriver = class {
       };
     }).filter((x) => x !== void 0).toArray();
   }
-  async onBeforeActorStart(actor2) {
+  async onBeforeActorStart(actor) {
     var _a;
-    const handler = this.#actors.get(actor2.id);
+    const handler = this.#actors.get(actor.id);
     _invariant2.default.call(void 0, handler, "missing actor handler in onBeforeActorReady");
     handler.actorStartError = void 0;
     (_a = handler.actorStartPromise) == null ? void 0 : _a.resolve();
     handler.actorStartPromise = void 0;
-    const metaEntries = await this.#hwsLoadAll(actor2.id);
-    await this.#runner.restoreHibernatingRequests(actor2.id, metaEntries);
+    const metaEntries = await this.#hwsLoadAll(actor.id);
+    await this.#runner.restoreHibernatingRequests(actor.id, metaEntries);
   }
   onCreateConn(conn) {
-    const hibernatable = conn[_chunkTI5PXQGGcjs.CONN_STATE_MANAGER_SYMBOL].hibernatableData;
+    const hibernatable = conn[_chunkHNE2AK6Ccjs.CONN_STATE_MANAGER_SYMBOL].hibernatableData;
     if (!hibernatable) return;
     this.#hwsMessageIndex.set(conn.id, {
       serverMessageIndex: hibernatable.serverMessageIndex,
@@ -758,7 +788,7 @@ var EngineActorDriver = class {
     });
   }
   onBeforePersistConn(conn) {
-    const stateManager = conn[_chunkTI5PXQGGcjs.CONN_STATE_MANAGER_SYMBOL];
+    const stateManager = conn[_chunkHNE2AK6Ccjs.CONN_STATE_MANAGER_SYMBOL];
     const hibernatable = stateManager.hibernatableDataOrError();
     const entry = this.#hwsMessageIndex.get(conn.id);
     if (!entry) {
@@ -772,7 +802,7 @@ var EngineActorDriver = class {
     entry.serverMessageIndex = hibernatable.serverMessageIndex;
   }
   onAfterPersistConn(conn) {
-    const stateManager = conn[_chunkTI5PXQGGcjs.CONN_STATE_MANAGER_SYMBOL];
+    const stateManager = conn[_chunkHNE2AK6Ccjs.CONN_STATE_MANAGER_SYMBOL];
     const hibernatable = stateManager.hibernatableDataOrError();
     const entry = this.#hwsMessageIndex.get(conn.id);
     if (!entry) {
@@ -795,149 +825,29 @@ var EngineActorDriver = class {
   }
 };
 
-// src/drivers/engine/config.ts
-var _v4 = require('zod/v4');
-var EngineConfigSchemaBase = _chunkIIJNPVPQcjs.ClientConfigSchemaBase.extend({
-  /** Unique key for this runner. Runners connecting a given key will replace any other runner connected with the same key. */
-  runnerKey: _v4.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkHYPIHCDTcjs.getRivetRunnerKey.call(void 0, )))),
-  /** How many actors this runner can run. */
-  totalSlots: _v4.z.number().default(1e5)
-});
-var EngineConfigSchemaTransformed = EngineConfigSchemaBase.transform(
-  (config, ctx) => transformEngineConfig(config, ctx)
-);
-var EngineConfigSchema = EngineConfigSchemaTransformed.default(
-  () => EngineConfigSchemaTransformed.parse({})
-);
-function transformEngineConfig(config, ctx) {
-  return {
-    ..._chunkIIJNPVPQcjs.transformClientConfig.call(void 0, config, ctx),
-    runnerKey: config.runnerKey
-  };
-}
-
 // src/drivers/engine/mod.ts
 function createEngineDriver() {
   return {
     name: "engine",
     displayName: "Engine",
     manager: (config) => {
-      const clientConfig = _chunkIIJNPVPQcjs.convertRegistryConfigToClientConfig.call(void 0, config);
-      return new (0, _chunkIIJNPVPQcjs.RemoteManagerDriver)(clientConfig);
+      const clientConfig = _chunkGUHXWPGBcjs.convertRegistryConfigToClientConfig.call(void 0, config);
+      return new (0, _chunkGUHXWPGBcjs.RemoteManagerDriver)(clientConfig);
     },
     actor: (config, managerDriver, inlineClient) => {
-      return new EngineActorDriver(
-        config,
-        managerDriver,
-        inlineClient
-      );
+      return new EngineActorDriver(config, managerDriver, inlineClient);
     },
     autoStartActorDriver: true
   };
 }
 
-// src/registry/config/legacy-runner.ts
-
-var LegacyDriverConfigSchema = _v4.z.object({
-  /** Machine-readable name to identify this driver by. */
-  name: _v4.z.string(),
-  manager: _v4.z.custom(),
-  actor: _v4.z.custom()
-});
-var LegacyRunnerConfigSchemaUnmerged = _v4.z.object({
-  driver: LegacyDriverConfigSchema.optional(),
-  /** @experimental */
-  maxIncomingMessageSize: _v4.z.number().optional().default(65536),
-  /** @experimental */
-  maxOutgoingMessageSize: _v4.z.number().optional().default(1048576),
-  /** @experimental */
-  inspector: _chunkTI5PXQGGcjs.InspectorConfigSchema,
-  /** @experimental */
-  disableDefaultServer: _v4.z.boolean().optional().default(false),
-  /** @experimental */
-  defaultServerPort: _v4.z.number().default(6420),
-  /** @experimental */
-  runEngine: _v4.z.boolean().optional().default(() => _chunkHYPIHCDTcjs.getRivetRunEngine.call(void 0, )),
-  /** @experimental */
-  runEngineVersion: _v4.z.string().optional().default(() => _nullishCoalesce(_chunkHYPIHCDTcjs.getRivetRunEngineVersion.call(void 0, ), () => ( _chunkHYPIHCDTcjs.VERSION))),
-  /** @experimental */
-  overrideServerAddress: _v4.z.string().optional(),
-  /** @experimental */
-  disableActorDriver: _v4.z.boolean().optional().default(false),
-  /**
-   * @experimental
-   *
-   * Whether to run runners normally or have them managed
-   * serverlessly (by the Rivet Engine for example).
-   */
-  runnerKind: _v4.z.enum(["serverless", "normal"]).optional().default(
-    () => _chunkHYPIHCDTcjs.getRivetRunnerKind.call(void 0, ) === "serverless" ? "serverless" : "normal"
-  ),
-  totalSlots: _v4.z.number().optional(),
-  /**
-   * @experimental
-   *
-   * Base path for the router. This is used to prefix all routes.
-   * For example, if the base path is `/api`, then the route `/actors` will be
-   * available at `/api/actors`.
-   */
-  basePath: _v4.z.string().optional().default("/"),
-  /**
-   * @experimental
-   *
-   * Disable welcome message.
-   * */
-  noWelcome: _v4.z.boolean().optional().default(false),
-  /**
-   * @experimental
-   * */
-  logging: _v4.z.object({
-    baseLogger: _v4.z.custom().optional(),
-    level: _chunkHYPIHCDTcjs.LogLevelSchema.optional()
-  }).optional().default(() => ({})),
-  /**
-   * @experimental
-   *
-   * Automatically configure serverless runners in the engine.
-   * Can only be used when runnerKind is "serverless".
-   * If true, uses default configuration. Can also provide custom configuration.
-   */
-  autoConfigureServerless: _v4.z.union([
-    _v4.z.boolean(),
-    _v4.z.object({
-      url: _v4.z.string().optional(),
-      headers: _v4.z.record(_v4.z.string(), _v4.z.string()).optional(),
-      maxRunners: _v4.z.number().optional(),
-      minRunners: _v4.z.number().optional(),
-      requestLifespan: _v4.z.number().optional(),
-      runnersMargin: _v4.z.number().optional(),
-      slotsPerRunner: _v4.z.number().optional(),
-      metadata: _v4.z.record(_v4.z.string(), _v4.z.unknown()).optional()
-    })
-  ]).optional(),
-  // This is a function to allow for lazy configuration of upgradeWebSocket on the
-  // fly. This is required since the dependencies that upgradeWebSocket
-  // (specifically Node.js) can sometimes only be specified after the router is
-  // created or must be imported async using `await import(...)`
-  getUpgradeWebSocket: _v4.z.custom().optional(),
-  /** @experimental */
-  token: _v4.z.string().optional().transform((v) => v || _chunkHYPIHCDTcjs.getRivetToken.call(void 0, ))
-}).merge(EngineConfigSchemaBase);
-var LegacyRunnerConfigSchemaTransformed = LegacyRunnerConfigSchemaUnmerged.transform((config, ctx) => ({
-  ...config,
-  ...transformEngineConfig(config, ctx)
-}));
-var LegacyRunnerConfigSchema = LegacyRunnerConfigSchemaTransformed.default(
-  () => LegacyRunnerConfigSchemaTransformed.parse({})
-);
-
 // runtime/index.ts
 
 
 // src/drivers/default.ts
 function chooseDefaultDriver(config) {
   if (config.endpoint && config.driver) {
-    throw new (0, _chunkL47L3ZWJcjs.UserError)(
+    throw new (0, _chunk6G7ZNM27cjs.UserError)(
       "Cannot specify both 'endpoint' and 'driver' in configuration"
     );
   }
@@ -945,43 +855,43 @@ function chooseDefaultDriver(config) {
     return config.driver;
   }
   if (config.endpoint || config.token) {
-    _chunkPB5AEMKQcjs.loggerWithoutContext.call(void 0, ).debug({
+    _chunkA4KEUCB6cjs.loggerWithoutContext.call(void 0, ).debug({
       msg: "using rivet engine driver",
       endpoint: config.endpoint
     });
     return createEngineDriver();
   }
-  _chunkPB5AEMKQcjs.loggerWithoutContext.call(void 0, ).debug({
+  _chunkA4KEUCB6cjs.loggerWithoutContext.call(void 0, ).debug({
     msg: "using default file system driver",
     storagePath: config.storagePath
   });
-  return _chunkU5SMSA27cjs.createFileSystemOrMemoryDriver.call(void 0, true, {
+  return _chunk2LY7RW3Ycjs.createFileSystemOrMemoryDriver.call(void 0, true, {
     path: config.storagePath
   });
 }
 
 // src/engine-process/log.ts
 function logger3() {
-  return _chunkHYPIHCDTcjs.getLogger.call(void 0, "engine-process");
+  return _chunkMPLMTJY5cjs.getLogger.call(void 0, "engine-process");
 }
 
 // src/engine-process/mod.ts
 var ENGINE_BASE_URL = "https://releases.rivet.dev/rivet";
 var ENGINE_BINARY_NAME = "rivet-engine";
 async function ensureEngineProcess(options) {
-  _chunkTI5PXQGGcjs.importNodeDependencies.call(void 0, );
+  _chunkCGGGBIDPcjs.importNodeDependencies.call(void 0, );
   logger3().debug({
     msg: "ensuring engine process",
     version: options.version
   });
-  const path = _chunkTI5PXQGGcjs.getNodePath.call(void 0, );
-  const storageRoot = _chunkU5SMSA27cjs.getStoragePath.call(void 0, );
+  const path = _chunkCGGGBIDPcjs.getNodePath.call(void 0, );
+  const storageRoot = _chunk2LY7RW3Ycjs.getStoragePath.call(void 0, );
   const binDir = path.join(storageRoot, "bin");
   const varDir = path.join(storageRoot, "var");
   const logsDir = path.join(varDir, "logs", "rivet-engine");
-  await _chunkU5SMSA27cjs.ensureDirectoryExists.call(void 0, binDir);
-  await _chunkU5SMSA27cjs.ensureDirectoryExists.call(void 0, varDir);
-  await _chunkU5SMSA27cjs.ensureDirectoryExists.call(void 0, logsDir);
+  await _chunk2LY7RW3Ycjs.ensureDirectoryExists.call(void 0, binDir);
+  await _chunk2LY7RW3Ycjs.ensureDirectoryExists.call(void 0, varDir);
+  await _chunk2LY7RW3Ycjs.ensureDirectoryExists.call(void 0, logsDir);
   if (await isEngineRunning()) {
     try {
       const health = await waitForEngineHealth();
@@ -1006,7 +916,7 @@ async function ensureEngineProcess(options) {
   const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/:/g, "-").replace(/\./g, "-");
   const stdoutLogPath = path.join(logsDir, `engine-${timestamp}-stdout.log`);
   const stderrLogPath = path.join(logsDir, `engine-${timestamp}-stderr.log`);
-  const fsSync = _chunkTI5PXQGGcjs.getNodeFsSync.call(void 0, );
+  const fsSync = _chunkCGGGBIDPcjs.getNodeFsSync.call(void 0, );
   const stdoutStream = fsSync.createWriteStream(stdoutLogPath, {
     flags: "a"
   });
@@ -1018,7 +928,7 @@ async function ensureEngineProcess(options) {
     stdout: stdoutLogPath,
     stderr: stderrLogPath
   });
-  const childProcess = _chunkTI5PXQGGcjs.getNodeChildProcess.call(void 0, );
+  const childProcess = _chunkCGGGBIDPcjs.getNodeChildProcess.call(void 0, );
   const child = childProcess.spawn(binaryPath, ["start"], {
     cwd: path.dirname(binaryPath),
     stdio: ["inherit", "pipe", "pipe"],
@@ -1087,7 +997,9 @@ async function ensureEngineProcess(options) {
         issues: "https://github.com/rivet-dev/rivetkit/issues",
         support: "https://rivet.dev/discord"
       });
-    } else if (stderrOutput.includes("Rivet Engine has been rolled back to a previous version")) {
+    } else if (stderrOutput.includes(
+      "Rivet Engine has been rolled back to a previous version"
+    )) {
       logger3().error({
         msg: "rivet engine version downgrade detected",
         hint: `You attempted to downgrade the RivetKit version in development. To fix this, nuke the database by running: '${binaryPath}' database nuke --yes`,
@@ -1154,8 +1066,8 @@ async function downloadEngineBinaryIfNeeded(binaryPath, version, varDir) {
       `failed to download rivet engine binary from ${downloadUrl}: ${response.status} ${response.statusText}`
     );
   }
-  const crypto2 = _chunkTI5PXQGGcjs.getNodeCrypto.call(void 0, );
-  const tempPath = `${binaryPath}.${crypto2.randomUUID()}.tmp`;
+  const crypto = _chunkCGGGBIDPcjs.getNodeCrypto.call(void 0, );
+  const tempPath = `${binaryPath}.${crypto.randomUUID()}.tmp`;
   const startTime = Date.now();
   logger3().debug({
     msg: "starting binary download",
@@ -1169,14 +1081,14 @@ async function downloadEngineBinaryIfNeeded(binaryPath, version, varDir) {
     });
   }, 5e3);
   try {
-    const stream = _chunkTI5PXQGGcjs.getNodeStream.call(void 0, );
-    const fsSync = _chunkTI5PXQGGcjs.getNodeFsSync.call(void 0, );
+    const stream = _chunkCGGGBIDPcjs.getNodeStream.call(void 0, );
+    const fsSync = _chunkCGGGBIDPcjs.getNodeFsSync.call(void 0, );
     await stream.pipeline(
       response.body,
       fsSync.createWriteStream(tempPath)
     );
     clearTimeout(slowDownloadWarning);
-    const fs = _chunkTI5PXQGGcjs.getNodeFs.call(void 0, );
+    const fs = _chunkCGGGBIDPcjs.getNodeFs.call(void 0, );
     const stats = await fs.stat(tempPath);
     const downloadDuration = Date.now() - startTime;
     if (process.platform !== "win32") {
@@ -1205,7 +1117,7 @@ async function downloadEngineBinaryIfNeeded(binaryPath, version, varDir) {
       support: "https://rivet.dev/discord"
     });
     try {
-      const fs = _chunkTI5PXQGGcjs.getNodeFs.call(void 0, );
+      const fs = _chunkCGGGBIDPcjs.getNodeFs.call(void 0, );
       await fs.unlink(tempPath);
     } catch (unlinkError) {
     }
@@ -1247,7 +1159,7 @@ function resolveTargetTripletFor(platform, arch) {
   );
 }
 async function isEngineRunning() {
-  return await checkIfEngineAlreadyRunningOnPort(_chunkTI5PXQGGcjs.ENGINE_PORT);
+  return await checkIfEngineAlreadyRunningOnPort(_chunkHNE2AK6Ccjs.ENGINE_PORT);
 }
 async function checkIfEngineAlreadyRunningOnPort(port) {
   let response;
@@ -1282,7 +1194,7 @@ async function checkIfEngineAlreadyRunningOnPort(port) {
 }
 async function fileExists(filePath) {
   try {
-    const fs = _chunkTI5PXQGGcjs.getNodeFs.call(void 0, );
+    const fs = _chunkCGGGBIDPcjs.getNodeFs.call(void 0, );
     await fs.access(filePath);
     return true;
   } catch (e) {
@@ -1296,7 +1208,7 @@ async function waitForEngineHealth() {
   logger3().debug({ msg: "waiting for engine health check" });
   for (let i = 0; i < maxRetries; i++) {
     try {
-      const response = await fetch(`${_chunkTI5PXQGGcjs.ENGINE_ENDPOINT}/health`, {
+      const response = await fetch(`${_chunkHNE2AK6Ccjs.ENGINE_ENDPOINT}/health`, {
         signal: AbortSignal.timeout(1e3)
       });
       if (response.ok) {
@@ -1336,7 +1248,7 @@ function getInspectorUrl(config, managerPort) {
 
 // src/serverless/log.ts
 function logger4() {
-  return _chunkHYPIHCDTcjs.getLogger.call(void 0, "serverless");
+  return _chunkMPLMTJY5cjs.getLogger.call(void 0, "serverless");
 }
 
 // src/serverless/configure.ts
@@ -1356,12 +1268,12 @@ async function configureServerlessRunner(config) {
     }
     const customConfig = config.serverless.configureRunnerPool;
     _invariant2.default.call(void 0, customConfig, "configureRunnerPool should exist");
-    const clientConfig = _chunkIIJNPVPQcjs.convertRegistryConfigToClientConfig.call(void 0, config);
+    const clientConfig = _chunkGUHXWPGBcjs.convertRegistryConfigToClientConfig.call(void 0, config);
     logger4().debug({
       msg: "fetching datacenters",
       endpoint: config.endpoint
     });
-    const dcsRes = await _chunkIIJNPVPQcjs.getDatacenters.call(void 0, clientConfig);
+    const dcsRes = await _chunkGUHXWPGBcjs.getDatacenters.call(void 0, clientConfig);
     const runnerName = _nullishCoalesce(customConfig.name, () => ( "default"));
     logger4().debug({
       msg: "configuring serverless runner",
@@ -1372,7 +1284,7 @@ async function configureServerlessRunner(config) {
       serverless: {
         url: customConfig.url,
         headers: _nullishCoalesce(customConfig.headers, () => ( {})),
-        max_runners: _nullishCoalesce(customConfig.maxRunners, () => ( 1e3)),
+        max_runners: _nullishCoalesce(customConfig.maxRunners, () => ( 1e5)),
         min_runners: _nullishCoalesce(customConfig.minRunners, () => ( 0)),
         request_lifespan: _nullishCoalesce(customConfig.requestLifespan, () => ( 15 * 60)),
         runners_margin: _nullishCoalesce(customConfig.runnersMargin, () => ( 0)),
@@ -1383,7 +1295,7 @@ async function configureServerlessRunner(config) {
       drain_on_version_upgrade: _nullishCoalesce(customConfig.drainOnVersionUpgrade, () => ( true)),
       metadataPollInterval: _nullishCoalesce(customConfig.metadataPollInterval, () => ( 1e3))
     };
-    await _chunkIIJNPVPQcjs.updateRunnerConfig.call(void 0, clientConfig, runnerName, {
+    await _chunkGUHXWPGBcjs.updateRunnerConfig.call(void 0, clientConfig, runnerName, {
       datacenters: Object.fromEntries(
         dcsRes.datacenters.map((dc) => [dc.name, serverlessConfig])
       )
@@ -1405,7 +1317,7 @@ async function configureServerlessRunner(config) {
 
 
 // src/manager/router-schema.ts
-
+var _v4 = require('zod/v4');
 var ServerlessStartHeadersSchema = _v4.z.object({
   endpoint: _v4.z.string({
     error: "x-rivet-endpoint header is required"
@@ -1424,7 +1336,7 @@ var ServerlessStartHeadersSchema = _v4.z.object({
 
 // src/serverless/router.ts
 function buildServerlessRouter(driverConfig, config) {
-  return _chunkTI5PXQGGcjs.createRouter.call(void 0, config.serverless.basePath, (router) => {
+  return _chunkCGGGBIDPcjs.createRouter.call(void 0, config.serverless.basePath, (router) => {
     router.get("/", (c) => {
       return c.text(
         "This is a RivetKit server.\n\nLearn more at https://rivetkit.org"
@@ -1440,7 +1352,7 @@ function buildServerlessRouter(driverConfig, config) {
         namespace: c.req.header("x-rivet-namespace-name")
       });
       if (!parseResult.success) {
-        throw new (0, _chunkL47L3ZWJcjs.InvalidRequest)(
+        throw new (0, _chunk6G7ZNM27cjs.InvalidRequest)(
           _nullishCoalesce(((_a = parseResult.error.issues[0]) == null ? void 0 : _a.message), () => ( "invalid serverless start headers"))
         );
       }
@@ -1454,31 +1366,39 @@ function buildServerlessRouter(driverConfig, config) {
       });
       if (config.endpoint) {
         if (!endpointsMatch(endpoint, config.endpoint)) {
-          throw new (0, _chunkL47L3ZWJcjs.EndpointMismatch)(config.endpoint, endpoint);
+          throw new (0, _chunk6G7ZNM27cjs.EndpointMismatch)(config.endpoint, endpoint);
         }
         if (namespace !== config.namespace) {
-          throw new (0, _chunkL47L3ZWJcjs.NamespaceMismatch)(config.namespace, namespace);
+          throw new (0, _chunk6G7ZNM27cjs.NamespaceMismatch)(config.namespace, namespace);
         }
       }
-      const newConfig = {
+      const sharedConfig = {
         ...config,
         endpoint,
         namespace,
-        token,
         runner: {
           ...config.runner,
           totalSlots,
-          runnerName,
-          // Not supported on serverless
-          runnerKey: void 0
+          runnerName
         }
       };
-      const managerDriver = new (0, _chunkIIJNPVPQcjs.RemoteManagerDriver)(
-        _chunkIIJNPVPQcjs.convertRegistryConfigToClientConfig.call(void 0, newConfig)
+      const runnerConfig = {
+        ...sharedConfig,
+        token
+      };
+      const clientConfig = {
+        ...sharedConfig,
+        // Preserve the configured application token for actor-to-actor
+        // calls. The start token is only needed for the runner
+        // connection and may not have gateway permissions.
+        token: _nullishCoalesce(config.token, () => ( token))
+      };
+      const managerDriver = new (0, _chunkGUHXWPGBcjs.RemoteManagerDriver)(
+        _chunkGUHXWPGBcjs.convertRegistryConfigToClientConfig.call(void 0, clientConfig)
       );
-      const client = _chunkIIJNPVPQcjs.createClientWithDriver.call(void 0, managerDriver);
+      const client = _chunkGUHXWPGBcjs.createClientWithDriver.call(void 0, managerDriver);
       const actorDriver = driverConfig.actor(
-        newConfig,
+        runnerConfig,
         managerDriver,
         client
       );
@@ -1488,10 +1408,10 @@ function buildServerlessRouter(driverConfig, config) {
       );
       return await actorDriver.serverlessHandleStart(c);
     });
-    router.get("/health", (c) => _chunkTI5PXQGGcjs.handleHealthRequest.call(void 0, c));
+    router.get("/health", (c) => _chunkHNE2AK6Ccjs.handleHealthRequest.call(void 0, c));
     router.get(
       "/metadata",
-      (c) => _chunkTI5PXQGGcjs.handleMetadataRequest.call(void 0, 
+      (c) => _chunkHNE2AK6Ccjs.handleMetadataRequest.call(void 0, 
         c,
         config,
         { serverless: {} },
@@ -1573,12 +1493,12 @@ var Runtime = class _Runtime {
   }
   static async create(registry) {
     var _a, _b, _c;
-    _chunkTI5PXQGGcjs.logger.call(void 0, ).info("rivetkit starting");
+    _chunkCGGGBIDPcjs.logger.call(void 0, ).info("rivetkit starting");
     const config = registry.parseConfig();
     if ((_a = config.logging) == null ? void 0 : _a.baseLogger) {
-      _chunkHYPIHCDTcjs.configureBaseLogger.call(void 0, config.logging.baseLogger);
+      _chunkMPLMTJY5cjs.configureBaseLogger.call(void 0, config.logging.baseLogger);
     } else {
-      _chunkHYPIHCDTcjs.configureDefaultLogger.call(void 0, (_b = config.logging) == null ? void 0 : _b.level);
+      _chunkMPLMTJY5cjs.configureDefaultLogger.call(void 0, (_b = config.logging) == null ? void 0 : _b.level);
     }
     _invariant2.default.call(void 0, 
       !(config.serverless.spawnEngine && config.serveManager),
@@ -1588,8 +1508,8 @@ var Runtime = class _Runtime {
     const managerDriver = driver.manager(config);
     let managerPort;
     if (config.serverless.spawnEngine) {
-      managerPort = _chunkTI5PXQGGcjs.ENGINE_PORT;
-      _chunkTI5PXQGGcjs.logger.call(void 0, ).debug({
+      managerPort = _chunkHNE2AK6Ccjs.ENGINE_PORT;
+      _chunkCGGGBIDPcjs.logger.call(void 0, ).debug({
         msg: "spawning engine",
         version: config.serverless.engineVersion
       });
@@ -1598,18 +1518,18 @@ var Runtime = class _Runtime {
       });
     } else if (config.serveManager) {
       const configuredManagerPort = config.managerPort;
-      const serveRuntime = _chunkHYPIHCDTcjs.detectRuntime.call(void 0, );
+      const serveRuntime = _chunkMPLMTJY5cjs.detectRuntime.call(void 0, );
       let upgradeWebSocket;
       const getUpgradeWebSocket = () => upgradeWebSocket;
       managerDriver.setGetUpgradeWebSocket(getUpgradeWebSocket);
-      const { router: managerRouter } = _chunkTI5PXQGGcjs.buildManagerRouter.call(void 0, 
+      const { router: managerRouter } = _chunkCGGGBIDPcjs.buildManagerRouter.call(void 0, 
         config,
         managerDriver,
         getUpgradeWebSocket,
         serveRuntime
       );
-      managerPort = await _chunkTI5PXQGGcjs.findFreePort.call(void 0, config.managerPort);
-      _chunkTI5PXQGGcjs.logger.call(void 0, ).debug({
+      managerPort = await _chunkCGGGBIDPcjs.findFreePort.call(void 0, config.managerPort);
+      _chunkCGGGBIDPcjs.logger.call(void 0, ).debug({
         msg: "serving manager",
         port: managerPort
       });
@@ -1618,13 +1538,40 @@ var Runtime = class _Runtime {
         config.serverless.publicEndpoint = config.publicEndpoint;
       }
       config.managerPort = managerPort;
-      const out = await _chunkTI5PXQGGcjs.crossPlatformServe.call(void 0, 
+      let serverApp = managerRouter;
+      if (config.publicDir) {
+        let dirExists = false;
+        try {
+          const fsSync = _chunkCGGGBIDPcjs.getNodeFsSync.call(void 0, );
+          dirExists = fsSync.existsSync(config.publicDir);
+        } catch (e3) {
+        }
+        if (dirExists) {
+          const { Hono } = await Promise.resolve().then(() => _interopRequireWildcard(require("hono")));
+          const serveStaticFn = await _chunkCGGGBIDPcjs.loadRuntimeServeStatic.call(void 0, serveRuntime);
+          const wrapper = new Hono();
+          wrapper.use(
+            "*",
+            serveStaticFn({ root: `./${config.publicDir}` })
+          );
+          wrapper.route("/", managerRouter);
+          serverApp = wrapper;
+        }
+      }
+      const out = await _chunkCGGGBIDPcjs.crossPlatformServe.call(void 0, 
         config,
         managerPort,
-        managerRouter,
+        serverApp,
         serveRuntime
       );
       upgradeWebSocket = out.upgradeWebSocket;
+      if (out.closeServer && process.env.NODE_ENV !== "production") {
+        const shutdown = () => {
+          out.closeServer();
+        };
+        process.on("SIGTERM", shutdown);
+        process.on("SIGINT", shutdown);
+      }
     }
     const runtime = new _Runtime(
       registry,
@@ -1634,7 +1581,7 @@ var Runtime = class _Runtime {
       managerPort
     );
     const driverLog = _nullishCoalesce(((_c = managerDriver.extraStartupLog) == null ? void 0 : _c.call(managerDriver)), () => ( {}));
-    _chunkTI5PXQGGcjs.logger.call(void 0, ).info({
+    _chunkCGGGBIDPcjs.logger.call(void 0, ).info({
       msg: "rivetkit ready",
       driver: driver.name,
       definitions: Object.keys(config.use).length,
@@ -1660,8 +1607,8 @@ var Runtime = class _Runtime {
     _invariant2.default.call(void 0, !this.#startKind, "Runtime already started as serverless");
     this.#startKind = "runner";
     if (this.#config.runner && this.#driver.autoStartActorDriver) {
-      _chunkTI5PXQGGcjs.logger.call(void 0, ).debug("starting actor driver");
-      const inlineClient = _chunkIIJNPVPQcjs.createClientWithDriver.call(void 0, 
+      _chunkCGGGBIDPcjs.logger.call(void 0, ).debug("starting actor driver");
+      const inlineClient = _chunkGUHXWPGBcjs.createClientWithDriver.call(void 0, 
         this.#managerDriver
       );
       this.#driver.actor(this.#config, this.#managerDriver, inlineClient);
@@ -1673,7 +1620,7 @@ var Runtime = class _Runtime {
     const inspectorUrl = this.managerPort ? getInspectorUrl(this.#config, this.managerPort) : void 0;
     console.log();
     console.log(
-      `  RivetKit ${_chunkHYPIHCDTcjs.package_default.version} (${this.#driver.displayName} - ${this.#startKind === "serverless" ? "Serverless" : "Runner"})`
+      `  RivetKit ${_chunkMPLMTJY5cjs.package_default.version} (${this.#driver.displayName} - ${this.#startKind === "serverless" ? "Serverless" : "Runner"})`
     );
     if (this.#config.namespace !== "default") {
       logLine("Namespace", this.#config.namespace);
@@ -1685,6 +1632,15 @@ var Runtime = class _Runtime {
     if (this.#startKind === "serverless" && this.#config.publicEndpoint) {
       logLine("Client", this.#config.publicEndpoint);
     }
+    if (this.#config.publicDir) {
+      try {
+        const fsSync = _chunkCGGGBIDPcjs.getNodeFsSync.call(void 0, );
+        if (fsSync.existsSync(this.#config.publicDir)) {
+          logLine("Static", `./${this.#config.publicDir}`);
+        }
+      } catch (e4) {
+      }
+    }
     if (inspectorUrl && this.#config.inspector.enabled) {
       logLine("Inspector", inspectorUrl);
     }
@@ -1714,18 +1670,19 @@ var Registry = class {
     return this.#config;
   }
   parseConfig() {
-    return _chunkTI5PXQGGcjs.RegistryConfigSchema.parse(this.#config);
+    return _chunkHNE2AK6Ccjs.RegistryConfigSchema.parse(this.#config);
   }
   // Shared runtime instance
   #runtime;
   #runtimePromise;
   constructor(config) {
     this.#config = config;
-    if (_chunkHYPIHCDTcjs.getNodeEnv.call(void 0, ) !== "test") {
-      setTimeout(() => {
+    setTimeout(() => {
+      const parsedConfig = this.parseConfig();
+      if (parsedConfig.serverless.spawnEngine || parsedConfig.serveManager) {
         this.#ensureRuntime();
-      }, 0);
-    }
+      }
+    }, 0);
   }
   /** Creates runtime if not already created. Idempotent. */
   #ensureRuntime() {
@@ -1769,55 +1726,33 @@ var Registry = class {
   startRunner() {
     this.#ensureRuntime().then((runtime) => runtime.startRunner());
   }
-  // MARK: Legacy
   /**
-   * Runs the registry for a server.
+   * Starts the server, serving both the actor API and static files.
+   *
+   * This is the simplest way to run RivetKit. It starts a local manager
+   * server, serves static files from the configured `publicDir` (default
+   * `"public"`), and starts the actor runner.
+   *
+   * When an endpoint is configured (via config or RIVET_ENDPOINT env var),
+   * operates in serverless mode connected to the remote engine instead.
    *
-   * @deprecated Use {@link Registry.startRunner} for long-running servers or {@link Registry.handler} for serverless deployments.
+   * @example
+   * ```ts
+   * const registry = setup({ use: { counter } });
+   * registry.start();
+   * ```
    */
-  start(inputConfig) {
-    const config = LegacyRunnerConfigSchema.parse(inputConfig);
-    if (config.autoConfigureServerless && config.runnerKind !== "serverless") {
-      throw new Error(
-        "autoConfigureServerless can only be configured when runnerKind is 'serverless'"
-      );
-    }
-    const isDevEnv = _chunkHYPIHCDTcjs.isDev.call(void 0, );
-    if (isDevEnv && config.runnerKind === "serverless") {
-      if ((inputConfig == null ? void 0 : inputConfig.runEngine) === void 0) config.runEngine = true;
-      if ((inputConfig == null ? void 0 : inputConfig.autoConfigureServerless) === void 0)
-        config.autoConfigureServerless = true;
+  start() {
+    if (this.#config.publicDir === void 0) {
+      this.#config.publicDir = "public";
     }
-    if (config.runnerKind === "serverless") {
-      return this.#legacyStartServerless(config, inputConfig);
-    } else {
-      return this.#legacyStartNormal(config);
+    if (this.#config.serveManager === void 0) {
+      const hasEndpoint = !!(this.#config.endpoint || typeof process !== "undefined" && (process.env.RIVET_ENGINE || process.env.RIVET_ENDPOINT));
+      if (!hasEndpoint) {
+        this.#config.serveManager = true;
+      }
     }
-  }
-  #legacyStartServerless(config, _inputConfig) {
-    const client = _chunkIIJNPVPQcjs.createClient.call(void 0, {
-      endpoint: config.endpoint,
-      token: config.token,
-      namespace: config.namespace,
-      headers: config.headers
-    });
-    return {
-      client,
-      fetch: this.handler.bind(this)
-    };
-  }
-  #legacyStartNormal(config) {
     this.#ensureRuntime().then((runtime) => runtime.startRunner());
-    const client = _chunkIIJNPVPQcjs.createClient.call(void 0, {
-      endpoint: config.endpoint,
-      token: config.token,
-      namespace: config.namespace,
-      headers: config.headers
-    });
-    return {
-      client,
-      fetch: this.handler.bind(this)
-    };
   }
 };
 function setup(input) {
@@ -1828,8 +1763,5 @@ function setup(input) {
 
 
 
-
-
-
-exports.actor = actor; exports.event = event2; exports.queue = queue2; exports.createEngineDriver = createEngineDriver; exports.Registry = Registry; exports.setup = setup;
-//# sourceMappingURL=chunk-OAXJWGMU.cjs.map
+exports.createEngineDriver = createEngineDriver; exports.Registry = Registry; exports.setup = setup;
+//# sourceMappingURL=chunk-VBR35EQF.cjs.map