rivetkit 2.0.20 → 2.0.21

package/dist/tsup/{chunk-2S7HJMMY.cjs → chunk-M5BHNJHB.cjs}

@@ -4,7 +4,7 @@
 
 
 
-var _chunkDUOTOMP7cjs = require('./chunk-DUOTOMP7.cjs');
+var _chunkZNWE3XBTcjs = require('./chunk-ZNWE3XBT.cjs');
 
 
 
@@ -17,10 +17,10 @@ var _chunkDUOTOMP7cjs = require('./chunk-DUOTOMP7.cjs');
 
 
 
-var _chunkJZD6FEOEcjs = require('./chunk-JZD6FEOE.cjs');
+var _chunkLMJHBF26cjs = require('./chunk-LMJHBF26.cjs');
 
 
-var _chunkZODINJWNcjs = require('./chunk-ZODINJWN.cjs');
+var _chunk65SAIRRYcjs = require('./chunk-65SAIRRY.cjs');
 
 
 
@@ -32,7 +32,7 @@ var _chunkZODINJWNcjs = require('./chunk-ZODINJWN.cjs');
 
 
 
-var _chunkFYP3TZXDcjs = require('./chunk-FYP3TZXD.cjs');
+var _chunkFDJ3AVNBcjs = require('./chunk-FDJ3AVNB.cjs');
 
 
 
@@ -58,12 +58,12 @@ var _chunkFYP3TZXDcjs = require('./chunk-FYP3TZXD.cjs');
 
 
 
-var _chunkPV22ZBDEcjs = require('./chunk-PV22ZBDE.cjs');
+var _chunkJKOUXDK6cjs = require('./chunk-JKOUXDK6.cjs');
 
 
 
 
-var _chunkRJVSNJO7cjs = require('./chunk-RJVSNJO7.cjs');
+var _chunkHN7UXCYQcjs = require('./chunk-HN7UXCYQ.cjs');
 
 
 
@@ -75,7 +75,7 @@ var _chunkRJVSNJO7cjs = require('./chunk-RJVSNJO7.cjs');
 
 
 
-var _chunkKUZWEM23cjs = require('./chunk-KUZWEM23.cjs');
+var _chunkELDFBXDVcjs = require('./chunk-ELDFBXDV.cjs');
 
 
 
@@ -158,7 +158,7 @@ var _streaming = require('hono/streaming');
 
 // src/manager/log.ts
 function logger() {
-  return _chunkRJVSNJO7cjs.getLogger.call(void 0, "actor-manager");
+  return _chunkHN7UXCYQcjs.getLogger.call(void 0, "actor-manager");
 }
 
 // src/manager/hono-websocket-adapter.ts
@@ -237,7 +237,11 @@ var HonoWebSocketAdapter = (_class = class {
             msg: "failed to convert blob to arraybuffer",
             error
           });
-          this.#fireEvent("error", { type: "error", target: this, error });
+          this.#fireEvent("error", {
+            type: "error",
+            target: this,
+            error
+          });
         });
       } else {
         logger().warn({
@@ -364,7 +368,10 @@ var HonoWebSocketAdapter = (_class = class {
         try {
           listener(event);
         } catch (error) {
-          logger().error({ msg: `error in ${type} event listener`, error });
+          logger().error({
+            msg: `error in ${type} event listener`,
+            error
+          });
         }
       }
     }
@@ -374,7 +381,10 @@ var HonoWebSocketAdapter = (_class = class {
           try {
             this.#onopen(event);
           } catch (error) {
-            logger().error({ msg: "error in onopen handler", error });
+            logger().error({
+              msg: "error in onopen handler",
+              error
+            });
           }
         }
         break;
@@ -383,7 +393,10 @@ var HonoWebSocketAdapter = (_class = class {
           try {
             this.#onclose(event);
           } catch (error) {
-            logger().error({ msg: "error in onclose handler", error });
+            logger().error({
+              msg: "error in onclose handler",
+              error
+            });
           }
         }
         break;
@@ -392,7 +405,10 @@ var HonoWebSocketAdapter = (_class = class {
           try {
             this.#onerror(event);
           } catch (error) {
-            logger().error({ msg: "error in onerror handler", error });
+            logger().error({
+              msg: "error in onerror handler",
+              error
+            });
           }
         }
         break;
@@ -401,7 +417,10 @@ var HonoWebSocketAdapter = (_class = class {
           try {
             this.#onmessage(event);
           } catch (error) {
-            logger().error({ msg: "error in onmessage handler", error });
+            logger().error({
+              msg: "error in onmessage handler",
+              error
+            });
           }
         }
         break;
@@ -446,14 +465,14 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
     promise: handlersPromise,
     resolve: handlersResolve,
     reject: handlersReject
-  } = _chunkKUZWEM23cjs.promiseWithResolvers.call(void 0, );
+  } = _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, );
   let actor2;
   try {
     actor2 = await actorDriver.loadActor(actorId);
   } catch (error) {
     return {
       onOpen: (_evt, ws) => {
-        const { code } = _chunkKUZWEM23cjs.deconstructError.call(void 0, 
+        const { code } = _chunkELDFBXDVcjs.deconstructError.call(void 0, 
           error,
           actor2.rLog,
           {
@@ -472,8 +491,8 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
       }
     };
   }
-  const closePromise = _chunkKUZWEM23cjs.promiseWithResolvers.call(void 0, );
-  const socketId = _chunkJZD6FEOEcjs.generateConnSocketId.call(void 0, );
+  const closePromise = _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, );
+  const socketId = _chunkLMJHBF26cjs.generateConnSocketId.call(void 0, );
   return {
     onOpen: (_evt, ws) => {
       actor2.rLog.debug("actor websocket open");
@@ -504,7 +523,7 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
           handlersResolve({ conn, actor: actor2, connId: conn.id });
         } catch (error) {
           handlersReject(error);
-          const { code } = _chunkKUZWEM23cjs.deconstructError.call(void 0, 
+          const { code } = _chunkELDFBXDVcjs.deconstructError.call(void 0, 
             error,
             actor2.rLog,
             {
@@ -520,12 +539,12 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
       handlersPromise.then(({ conn, actor: actor3 }) => {
         actor3.rLog.debug({ msg: "received message" });
         const value = evt.data.valueOf();
-        _chunkFYP3TZXDcjs.parseMessage.call(void 0, value, {
+        _chunkFDJ3AVNBcjs.parseMessage.call(void 0, value, {
           encoding,
           maxIncomingMessageSize: runConfig.maxIncomingMessageSize
         }).then((message) => {
           actor3.processMessage(message, conn).catch((error) => {
-            const { code } = _chunkKUZWEM23cjs.deconstructError.call(void 0, 
+            const { code } = _chunkELDFBXDVcjs.deconstructError.call(void 0, 
               error,
               actor3.rLog,
               {
@@ -536,7 +555,7 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
             ws.close(1011, code);
           });
         }).catch((error) => {
-          const { code } = _chunkKUZWEM23cjs.deconstructError.call(void 0, 
+          const { code } = _chunkELDFBXDVcjs.deconstructError.call(void 0, 
             error,
             actor3.rLog,
             {
@@ -547,7 +566,7 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
           ws.close(1011, code);
         });
       }).catch((error) => {
-        const { code } = _chunkKUZWEM23cjs.deconstructError.call(void 0, 
+        const { code } = _chunkELDFBXDVcjs.deconstructError.call(void 0, 
           error,
           actor2.rLog,
           {
@@ -581,7 +600,7 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
         const wasClean = event.wasClean || event.code === 1e3;
         actor3.__connDisconnected(conn, wasClean, socketId);
       }).catch((error) => {
-        _chunkKUZWEM23cjs.deconstructError.call(void 0, 
+        _chunkELDFBXDVcjs.deconstructError.call(void 0, 
           error,
           actor2.rLog,
           { wsEvent: "close" },
@@ -593,7 +612,7 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
       try {
         actor2.rLog.warn({ msg: "websocket error" });
       } catch (error) {
-        _chunkKUZWEM23cjs.deconstructError.call(void 0, 
+        _chunkELDFBXDVcjs.deconstructError.call(void 0, 
           error,
           actor2.rLog,
           { wsEvent: "error" },
@@ -607,9 +626,9 @@ async function handleSseConnect(c, _runConfig, actorDriver, actorId) {
   c.header("Content-Encoding", "Identity");
   const encoding = getRequestEncoding(c.req);
   const parameters = getRequestConnParams(c.req);
-  const socketId = _chunkJZD6FEOEcjs.generateConnSocketId.call(void 0, );
-  const connId = c.req.header(_chunkPV22ZBDEcjs.HEADER_CONN_ID);
-  const connToken = c.req.header(_chunkPV22ZBDEcjs.HEADER_CONN_TOKEN);
+  const socketId = _chunkLMJHBF26cjs.generateConnSocketId.call(void 0, );
+  const connId = c.req.header(_chunkJKOUXDK6cjs.HEADER_CONN_ID);
+  const connToken = c.req.header(_chunkJKOUXDK6cjs.HEADER_CONN_TOKEN);
   return _streaming.streamSSE.call(void 0, c, async (stream) => {
     let actor2;
     let conn;
@@ -634,12 +653,12 @@ async function handleSseConnect(c, _runConfig, actorDriver, actorId) {
         connId,
         connToken
       );
-      const abortResolver = _chunkKUZWEM23cjs.promiseWithResolvers.call(void 0, );
+      const abortResolver = _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, );
       stream.onAbort(() => {
       });
       c.req.raw.signal.addEventListener("abort", async () => {
         _invariant2.default.call(void 0, actor2, "actor should exist");
-        const rLog = _nullishCoalesce(actor2.rLog, () => ( _chunkPV22ZBDEcjs.loggerWithoutContext.call(void 0, )));
+        const rLog = _nullishCoalesce(actor2.rLog, () => ( _chunkJKOUXDK6cjs.loggerWithoutContext.call(void 0, )));
         try {
           rLog.debug("sse stream aborted");
           if (conn) {
@@ -664,7 +683,10 @@ async function handleSseConnect(c, _runConfig, actorDriver, actorId) {
         await stream.sleep(SSE_PING_INTERVAL);
       }
     } catch (error) {
-      _chunkPV22ZBDEcjs.loggerWithoutContext.call(void 0, ).error({ msg: "error in sse connection", error });
+      _chunkJKOUXDK6cjs.loggerWithoutContext.call(void 0, ).error({
+        msg: "error in sse connection",
+        error
+      });
       if (conn && actor2 !== void 0) {
         actor2.__connDisconnected(conn, false, socketId);
       }
@@ -676,13 +698,13 @@ async function handleAction(c, _runConfig, actorDriver, actionName, actorId) {
   const encoding = getRequestEncoding(c.req);
   const parameters = getRequestConnParams(c.req);
   const arrayBuffer = await c.req.arrayBuffer();
-  const request = _chunkPV22ZBDEcjs.deserializeWithEncoding.call(void 0, 
+  const request = _chunkJKOUXDK6cjs.deserializeWithEncoding.call(void 0, 
     encoding,
     new Uint8Array(arrayBuffer),
-    _chunkFYP3TZXDcjs.HTTP_ACTION_REQUEST_VERSIONED
+    _chunkFDJ3AVNBcjs.HTTP_ACTION_REQUEST_VERSIONED
   );
   const actionArgs = cbor.decode(new Uint8Array(request.args));
-  const socketId = _chunkJZD6FEOEcjs.generateConnSocketId.call(void 0, );
+  const socketId = _chunkLMJHBF26cjs.generateConnSocketId.call(void 0, );
   let actor2;
   let conn;
   let output;
@@ -697,7 +719,7 @@ async function handleAction(c, _runConfig, actorDriver, actionName, actorId) {
       parameters,
       c.req.raw
     );
-    const ctx = new (0, _chunkFYP3TZXDcjs.ActionContext)(actor2.actorContext, conn);
+    const ctx = new (0, _chunkFDJ3AVNBcjs.ActionContext)(actor2.actorContext, conn);
     output = await actor2.executeAction(ctx, actionName, actionArgs);
   } finally {
     if (conn) {
@@ -705,24 +727,24 @@ async function handleAction(c, _runConfig, actorDriver, actionName, actorId) {
     }
   }
   const responseData = {
-    output: _chunkKUZWEM23cjs.bufferToArrayBuffer.call(void 0, cbor.encode(output))
+    output: _chunkELDFBXDVcjs.bufferToArrayBuffer.call(void 0, cbor.encode(output))
   };
-  const serialized = _chunkPV22ZBDEcjs.serializeWithEncoding.call(void 0, 
+  const serialized = _chunkJKOUXDK6cjs.serializeWithEncoding.call(void 0, 
     encoding,
     responseData,
-    _chunkFYP3TZXDcjs.HTTP_ACTION_RESPONSE_VERSIONED
+    _chunkFDJ3AVNBcjs.HTTP_ACTION_RESPONSE_VERSIONED
   );
   return c.body(serialized, 200, {
-    "Content-Type": _chunkPV22ZBDEcjs.contentTypeForEncoding.call(void 0, encoding)
+    "Content-Type": _chunkJKOUXDK6cjs.contentTypeForEncoding.call(void 0, encoding)
   });
 }
 async function handleConnectionMessage(c, _runConfig, actorDriver, connId, connToken, actorId) {
   const encoding = getRequestEncoding(c.req);
   const arrayBuffer = await c.req.arrayBuffer();
-  const message = _chunkPV22ZBDEcjs.deserializeWithEncoding.call(void 0, 
+  const message = _chunkJKOUXDK6cjs.deserializeWithEncoding.call(void 0, 
     encoding,
     new Uint8Array(arrayBuffer),
-    _chunkFYP3TZXDcjs.TO_SERVER_VERSIONED
+    _chunkFDJ3AVNBcjs.TO_SERVER_VERSIONED
   );
   const actor2 = await actorDriver.loadActor(actorId);
   const conn = actor2.conns.get(connId);
@@ -803,11 +825,11 @@ async function handleRawWebSocketHandler(req, path4, actorDriver, actorId) {
   };
 }
 function getRequestEncoding(req) {
-  const encodingParam = req.header(_chunkPV22ZBDEcjs.HEADER_ENCODING);
+  const encodingParam = req.header(_chunkJKOUXDK6cjs.HEADER_ENCODING);
   if (!encodingParam) {
     throw new (0, _chunkKSRXX3Z4cjs.InvalidEncoding)("undefined");
   }
-  const result = _chunkPV22ZBDEcjs.EncodingSchema.safeParse(encodingParam);
+  const result = _chunkJKOUXDK6cjs.EncodingSchema.safeParse(encodingParam);
   if (!result.success) {
     throw new (0, _chunkKSRXX3Z4cjs.InvalidEncoding)(encodingParam);
   }
@@ -817,7 +839,7 @@ function getRequestExposeInternalError(_req) {
   return false;
 }
 function getRequestConnParams(req) {
-  const paramsParam = req.header(_chunkPV22ZBDEcjs.HEADER_CONN_PARAMS);
+  const paramsParam = req.header(_chunkJKOUXDK6cjs.HEADER_CONN_PARAMS);
   if (!paramsParam) {
     return null;
   }
@@ -825,7 +847,7 @@ function getRequestConnParams(req) {
     return JSON.parse(paramsParam);
   } catch (err) {
     throw new (0, _chunkKSRXX3Z4cjs.InvalidParams)(
-      `Invalid params JSON: ${_chunkKUZWEM23cjs.stringifyError.call(void 0, err)}`
+      `Invalid params JSON: ${_chunkELDFBXDVcjs.stringifyError.call(void 0, err)}`
     );
   }
 }
@@ -859,7 +881,7 @@ function buildActorNames(registryConfig) {
 
 // src/common/router.ts
 function logger2() {
-  return _chunkRJVSNJO7cjs.getLogger.call(void 0, "router");
+  return _chunkHN7UXCYQcjs.getLogger.call(void 0, "router");
 }
 function loggerMiddleware(logger8) {
   return async (c, next) => {
@@ -877,7 +899,7 @@ function loggerMiddleware(logger8) {
       reqSize: c.req.header("content-length"),
       resSize: c.res.headers.get("content-length"),
       userAgent: c.req.header("user-agent"),
-      ..._chunkKUZWEM23cjs.getEnvUniversal.call(void 0, "_RIVET_LOG_HEADERS") ? { allHeaders: JSON.stringify(c.req.header()) } : {}
+      ..._chunkELDFBXDVcjs.getEnvUniversal.call(void 0, "_RIVET_LOG_HEADERS") ? { allHeaders: JSON.stringify(c.req.header()) } : {}
     });
   };
 }
@@ -886,7 +908,7 @@ function handleRouteNotFound(c) {
 }
 function handleRouteError(error, c) {
   const exposeInternalError = getRequestExposeInternalError(c.req.raw);
-  const { statusCode, group, code, message, metadata } = _chunkKUZWEM23cjs.deconstructError.call(void 0, 
+  const { statusCode, group, code, message, metadata } = _chunkELDFBXDVcjs.deconstructError.call(void 0, 
     error,
     logger2(),
     {
@@ -901,29 +923,29 @@ function handleRouteError(error, c) {
   } catch (_) {
     encoding = "json";
   }
-  const output = _chunkPV22ZBDEcjs.serializeWithEncoding.call(void 0, 
+  const output = _chunkJKOUXDK6cjs.serializeWithEncoding.call(void 0, 
     encoding,
     {
       group,
       code,
       message,
       // TODO: Cannot serialize non-binary meta since it requires ArrayBuffer atm
-      metadata: _chunkPV22ZBDEcjs.encodingIsBinary.call(void 0, encoding) ? _chunkKUZWEM23cjs.bufferToArrayBuffer.call(void 0, cbor2.encode(metadata)) : null
+      metadata: _chunkJKOUXDK6cjs.encodingIsBinary.call(void 0, encoding) ? _chunkELDFBXDVcjs.bufferToArrayBuffer.call(void 0, cbor2.encode(metadata)) : null
     },
-    _chunkFYP3TZXDcjs.HTTP_RESPONSE_ERROR_VERSIONED
+    _chunkFDJ3AVNBcjs.HTTP_RESPONSE_ERROR_VERSIONED
   );
   return c.body(output, { status: statusCode });
 }
 function handleMetadataRequest(c, registryConfig, runConfig) {
   const response = {
     runtime: "rivetkit",
-    version: _chunkKUZWEM23cjs.VERSION,
+    version: _chunkELDFBXDVcjs.VERSION,
     runner: {
       kind: runConfig.runnerKind === "serverless" ? { serverless: {} } : { normal: {} }
     },
     actorNames: buildActorNames(registryConfig),
     // Do not return client endpoint if default server disabled
-    clientEndpoint: _nullishCoalesce(runConfig.overrideServerAddress, () => ( (runConfig.disableDefaultServer ? void 0 : _chunkJZD6FEOEcjs.getEndpoint.call(void 0, runConfig))))
+    clientEndpoint: _nullishCoalesce(runConfig.overrideServerAddress, () => ( (runConfig.disableDefaultServer ? void 0 : _chunkLMJHBF26cjs.getEndpoint.call(void 0, runConfig))))
   };
   return c.json(response);
 }
@@ -931,14 +953,16 @@ function handleHealthRequest(c) {
   return c.json({
     status: "ok",
     runtime: "rivetkit",
-    version: _chunkKUZWEM23cjs.VERSION
+    version: _chunkELDFBXDVcjs.VERSION
   });
 }
 
 // src/actor/router.ts
 function createActorRouter(runConfig, actorDriver, isTest) {
-  const router = new (0, _hono.Hono)({ strict: false });
-  router.use("*", loggerMiddleware(_chunkPV22ZBDEcjs.loggerWithoutContext.call(void 0, )));
+  const router = new (0, _hono.Hono)({
+    strict: false
+  });
+  router.use("*", loggerMiddleware(_chunkJKOUXDK6cjs.loggerWithoutContext.call(void 0, )));
   router.get("/", (c) => {
     return c.text(
       "This is an RivetKit actor.\n\nLearn more at https://rivetkit.org"
@@ -969,7 +993,7 @@ function createActorRouter(runConfig, actorDriver, isTest) {
       return c.json({ success: true });
     });
   }
-  router.get(_chunkPV22ZBDEcjs.PATH_CONNECT_WEBSOCKET, async (c) => {
+  router.get(_chunkJKOUXDK6cjs.PATH_CONNECT_WEBSOCKET, async (c) => {
     var _a;
     const upgradeWebSocket = (_a = runConfig.getUpgradeWebSocket) == null ? void 0 : _a.call(runConfig);
     if (upgradeWebSocket) {
@@ -982,20 +1006,28 @@ function createActorRouter(runConfig, actorDriver, isTest) {
         if (protocols) {
           const protocolList = protocols.split(",").map((p) => p.trim());
           for (const protocol of protocolList) {
-            if (protocol.startsWith(_chunkPV22ZBDEcjs.WS_PROTOCOL_ENCODING)) {
-              encodingRaw = protocol.substring(_chunkPV22ZBDEcjs.WS_PROTOCOL_ENCODING.length);
-            } else if (protocol.startsWith(_chunkPV22ZBDEcjs.WS_PROTOCOL_CONN_PARAMS)) {
+            if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_ENCODING)) {
+              encodingRaw = protocol.substring(
+                _chunkJKOUXDK6cjs.WS_PROTOCOL_ENCODING.length
+              );
+            } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_PARAMS)) {
               connParamsRaw = decodeURIComponent(
-                protocol.substring(_chunkPV22ZBDEcjs.WS_PROTOCOL_CONN_PARAMS.length)
+                protocol.substring(
+                  _chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_PARAMS.length
+                )
+              );
+            } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_ID)) {
+              connIdRaw = protocol.substring(
+                _chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_ID.length
+              );
+            } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_TOKEN)) {
+              connTokenRaw = protocol.substring(
+                _chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_TOKEN.length
               );
-            } else if (protocol.startsWith(_chunkPV22ZBDEcjs.WS_PROTOCOL_CONN_ID)) {
-              connIdRaw = protocol.substring(_chunkPV22ZBDEcjs.WS_PROTOCOL_CONN_ID.length);
-            } else if (protocol.startsWith(_chunkPV22ZBDEcjs.WS_PROTOCOL_CONN_TOKEN)) {
-              connTokenRaw = protocol.substring(_chunkPV22ZBDEcjs.WS_PROTOCOL_CONN_TOKEN.length);
             }
           }
         }
-        const encoding = _chunkPV22ZBDEcjs.EncodingSchema.parse(encodingRaw);
+        const encoding = _chunkJKOUXDK6cjs.EncodingSchema.parse(encodingRaw);
         const connParams = connParamsRaw ? JSON.parse(connParamsRaw) : void 0;
         return await handleWebSocketConnect(
           c2.req.raw,
@@ -1007,7 +1039,7 @@ function createActorRouter(runConfig, actorDriver, isTest) {
           connIdRaw,
           connTokenRaw
         );
-      })(c, _chunkKUZWEM23cjs.noopNext.call(void 0, ));
+      })(c, _chunkELDFBXDVcjs.noopNext.call(void 0, ));
     } else {
       return c.text(
         "WebSockets are not enabled for this driver. Use SSE instead.",
@@ -1020,11 +1052,17 @@ function createActorRouter(runConfig, actorDriver, isTest) {
   });
   router.post("/action/:action", async (c) => {
     const actionName = c.req.param("action");
-    return handleAction(c, runConfig, actorDriver, actionName, c.env.actorId);
+    return handleAction(
+      c,
+      runConfig,
+      actorDriver,
+      actionName,
+      c.env.actorId
+    );
   });
   router.post("/connections/message", async (c) => {
-    const connId = c.req.header(_chunkPV22ZBDEcjs.HEADER_CONN_ID);
-    const connToken = c.req.header(_chunkPV22ZBDEcjs.HEADER_CONN_TOKEN);
+    const connId = c.req.header(_chunkJKOUXDK6cjs.HEADER_CONN_ID);
+    const connToken = c.req.header(_chunkJKOUXDK6cjs.HEADER_CONN_TOKEN);
     if (!connId || !connToken) {
       throw new Error("Missing required parameters");
     }
@@ -1038,8 +1076,8 @@ function createActorRouter(runConfig, actorDriver, isTest) {
     );
   });
   router.post("/connections/close", async (c) => {
-    const connId = c.req.header(_chunkPV22ZBDEcjs.HEADER_CONN_ID);
-    const connToken = c.req.header(_chunkPV22ZBDEcjs.HEADER_CONN_TOKEN);
+    const connId = c.req.header(_chunkJKOUXDK6cjs.HEADER_CONN_ID);
+    const connToken = c.req.header(_chunkJKOUXDK6cjs.HEADER_CONN_TOKEN);
     if (!connId || !connToken) {
       throw new Error("Missing required parameters");
     }
@@ -1063,7 +1101,7 @@ function createActorRouter(runConfig, actorDriver, isTest) {
       body: c.req.raw.body,
       duplex: "half"
     });
-    _chunkPV22ZBDEcjs.loggerWithoutContext.call(void 0, ).debug({
+    _chunkJKOUXDK6cjs.loggerWithoutContext.call(void 0, ).debug({
       msg: "rewriting http url",
       from: c.req.url,
       to: correctedRequest.url
@@ -1074,14 +1112,14 @@ function createActorRouter(runConfig, actorDriver, isTest) {
     }
     return response;
   });
-  router.get(`${_chunkPV22ZBDEcjs.PATH_RAW_WEBSOCKET_PREFIX}*`, async (c) => {
+  router.get(`${_chunkJKOUXDK6cjs.PATH_RAW_WEBSOCKET_PREFIX}*`, async (c) => {
     var _a;
     const upgradeWebSocket = (_a = runConfig.getUpgradeWebSocket) == null ? void 0 : _a.call(runConfig);
     if (upgradeWebSocket) {
       return upgradeWebSocket(async (c2) => {
         const url = new URL(c2.req.url);
         const pathWithQuery = c2.req.path + url.search;
-        _chunkPV22ZBDEcjs.loggerWithoutContext.call(void 0, ).debug({
+        _chunkJKOUXDK6cjs.loggerWithoutContext.call(void 0, ).debug({
           msg: "actor router raw websocket",
           path: c2.req.path,
           url: c2.req.url,
@@ -1094,7 +1132,7 @@ function createActorRouter(runConfig, actorDriver, isTest) {
           actorDriver,
           c2.env.actorId
         );
-      })(c, _chunkKUZWEM23cjs.noopNext.call(void 0, ));
+      })(c, _chunkELDFBXDVcjs.noopNext.call(void 0, ));
     } else {
       return c.text(
         "WebSockets are not enabled for this driver. Use SSE instead.",
@@ -1102,19 +1140,22 @@ function createActorRouter(runConfig, actorDriver, isTest) {
       );
     }
   });
-  if (_chunkDUOTOMP7cjs.isInspectorEnabled.call(void 0, runConfig, "actor")) {
+  if (_chunkZNWE3XBTcjs.isInspectorEnabled.call(void 0, runConfig, "actor")) {
     router.route(
       "/inspect",
       new (0, _hono.Hono)().use(
         _cors.cors.call(void 0, runConfig.inspector.cors),
-        _chunkDUOTOMP7cjs.secureInspector.call(void 0, runConfig),
+        _chunkZNWE3XBTcjs.secureInspector.call(void 0, runConfig),
         async (c, next) => {
           const inspector = (await actorDriver.loadActor(c.env.actorId)).inspector;
-          _invariant2.default.call(void 0, inspector, "inspector not supported on this platform");
+          _invariant2.default.call(void 0, 
+            inspector,
+            "inspector not supported on this platform"
+          );
           c.set("inspector", inspector);
           return next();
         }
-      ).route("/", _chunkJZD6FEOEcjs.createActorInspectorRouter.call(void 0, ))
+      ).route("/", _chunkLMJHBF26cjs.createActorInspectorRouter.call(void 0, ))
     );
   }
   router.notFound(handleRouteNotFound);
@@ -1125,13 +1166,13 @@ function createActorRouter(runConfig, actorDriver, isTest) {
 // src/actor/mod.ts
 function actor(input) {
   const config2 = ActorConfigSchema.parse(input);
-  return new (0, _chunkJZD6FEOEcjs.ActorDefinition)(config2);
+  return new (0, _chunkLMJHBF26cjs.ActorDefinition)(config2);
 }
 
 // src/common/inline-websocket-adapter2.ts
 var _ws2 = require('hono/ws');
 function logger3() {
-  return _chunkRJVSNJO7cjs.getLogger.call(void 0, "fake-event-source2");
+  return _chunkHN7UXCYQcjs.getLogger.call(void 0, "fake-event-source2");
 }
 var InlineWebSocketAdapter2 = (_class2 = class {
   // WebSocket readyState values
@@ -1213,7 +1254,10 @@ var InlineWebSocketAdapter2 = (_class2 = class {
     logger3().debug({ msg: "closing fake websocket", code, reason });
     this.#readyState = this.CLOSING;
     try {
-      this.#handler.onClose({ code, reason, wasClean: true }, this.#wsContext);
+      this.#handler.onClose(
+        { code, reason, wasClean: true },
+        this.#wsContext
+      );
     } catch (err) {
       logger3().error({ msg: "error closing websocket", error: err });
     } finally {
@@ -1352,7 +1396,10 @@ var InlineWebSocketAdapter2 = (_class2 = class {
           try {
             this.#onopen(event);
           } catch (error) {
-            logger3().error({ msg: "error in onopen handler", error });
+            logger3().error({
+              msg: "error in onopen handler",
+              error
+            });
           }
         }
         break;
@@ -1361,7 +1408,10 @@ var InlineWebSocketAdapter2 = (_class2 = class {
           try {
             this.#onclose(event);
           } catch (error) {
-            logger3().error({ msg: "error in onclose handler", error });
+            logger3().error({
+              msg: "error in onclose handler",
+              error
+            });
           }
         }
         break;
@@ -1370,7 +1420,10 @@ var InlineWebSocketAdapter2 = (_class2 = class {
           try {
             this.#onerror(event);
           } catch (error) {
-            logger3().error({ msg: "error in onerror handler", error });
+            logger3().error({
+              msg: "error in onerror handler",
+              error
+            });
           }
         }
         break;
@@ -1379,7 +1432,10 @@ var InlineWebSocketAdapter2 = (_class2 = class {
           try {
             this.#onmessage(event);
           } catch (error) {
-            logger3().error({ msg: "error in onmessage handler", error });
+            logger3().error({
+              msg: "error in onmessage handler",
+              error
+            });
           }
         }
         break;
@@ -1479,7 +1535,7 @@ var KEYS = {
 
 // src/drivers/engine/log.ts
 function logger4() {
-  return _chunkRJVSNJO7cjs.getLogger.call(void 0, "driver-engine");
+  return _chunkHN7UXCYQcjs.getLogger.call(void 0, "driver-engine");
 }
 
 // src/drivers/engine/actor-driver.ts
@@ -1494,8 +1550,8 @@ var EngineActorDriver = class {
   #version = 1;
   // Version for the runner protocol
   #alarmTimeout;
-  #runnerStarted = Promise.withResolvers();
-  #runnerStopped = Promise.withResolvers();
+  #runnerStarted = _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, );
+  #runnerStopped = _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, );
   constructor(registryConfig, runConfig, managerDriver, inlineClient) {
     this.#registryConfig = registryConfig;
     this.#runConfig = runConfig;
@@ -1513,7 +1569,7 @@ var EngineActorDriver = class {
     let hasDisconnected = false;
     const engineRunnerConfig = {
       version: this.#version,
-      endpoint: _chunkJZD6FEOEcjs.getEndpoint.call(void 0, runConfig),
+      endpoint: _chunkLMJHBF26cjs.getEndpoint.call(void 0, runConfig),
       token,
       namespace: _nullishCoalesce(runConfig.namespace, () => ( runConfig.namespace)),
       totalSlots: _nullishCoalesce(runConfig.totalSlots, () => ( runConfig.totalSlots)),
@@ -1554,7 +1610,7 @@ var EngineActorDriver = class {
       websocket: this.#runnerWebSocket.bind(this),
       onActorStart: this.#runnerOnActorStart.bind(this),
       onActorStop: this.#runnerOnActorStop.bind(this),
-      logger: _chunkRJVSNJO7cjs.getLogger.call(void 0, "engine-runner")
+      logger: _chunkHN7UXCYQcjs.getLogger.call(void 0, "engine-runner")
     };
     this.#runner = new (0, _enginerunner.Runner)(engineRunnerConfig);
     this.#runner.start();
@@ -1567,7 +1623,8 @@ var EngineActorDriver = class {
   }
   async #loadActorHandler(actorId) {
     const handler = this.#actors.get(actorId);
-    if (!handler) throw new Error(`Actor handler does not exist ${actorId}`);
+    if (!handler)
+      throw new Error(`Actor handler does not exist ${actorId}`);
     if (handler.actorStartPromise) await handler.actorStartPromise.promise;
     if (!handler.actor) throw new Error("Actor should be loaded");
     return handler;
@@ -1597,7 +1654,7 @@ var EngineActorDriver = class {
       this.#alarmTimeout = void 0;
     }
     const delay = Math.max(0, timestamp - Date.now());
-    this.#alarmTimeout = _chunkKUZWEM23cjs.setLongTimeout.call(void 0, () => {
+    this.#alarmTimeout = _chunkELDFBXDVcjs.setLongTimeout.call(void 0, () => {
       actor2._onAlarm();
       this.#alarmTimeout = void 0;
     }, delay);
@@ -1607,35 +1664,38 @@ var EngineActorDriver = class {
     return void 0;
   }
   // Runner lifecycle callbacks
-  async #runnerOnActorStart(actorId, generation, runConfig) {
+  async #runnerOnActorStart(actorId, generation, actorConfig) {
     var _a;
     logger4().debug({
       msg: "runner actor starting",
       actorId,
-      name: runConfig.name,
-      key: runConfig.key,
+      name: actorConfig.name,
+      key: actorConfig.key,
       generation
     });
     let input;
-    if (runConfig.input) {
-      input = cbor3.decode(runConfig.input);
+    if (actorConfig.input) {
+      input = cbor3.decode(actorConfig.input);
     }
     let handler = this.#actors.get(actorId);
     if (!handler) {
       handler = {
-        actorStartPromise: _chunkKUZWEM23cjs.promiseWithResolvers.call(void 0, ),
+        actorStartPromise: _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, ),
         persistedData: void 0
       };
       this.#actors.set(actorId, handler);
       const [persistedValue] = await this.#runner.kvGet(actorId, [
         KEYS.PERSIST_DATA
       ]);
-      handler.persistedData = persistedValue !== null ? persistedValue : _chunkFYP3TZXDcjs.serializeEmptyPersistData.call(void 0, input);
+      handler.persistedData = persistedValue !== null ? persistedValue : _chunkFDJ3AVNBcjs.serializeEmptyPersistData.call(void 0, input);
     }
-    const name = runConfig.name;
-    _invariant2.default.call(void 0, runConfig.key, "actor should have a key");
-    const key = _chunkJZD6FEOEcjs.deserializeActorKey.call(void 0, runConfig.key);
-    const definition = _chunkJZD6FEOEcjs.lookupInRegistry.call(void 0, this.#registryConfig, runConfig.name);
+    const name = actorConfig.name;
+    _invariant2.default.call(void 0, actorConfig.key, "actor should have a key");
+    const key = _chunkLMJHBF26cjs.deserializeActorKey.call(void 0, actorConfig.key);
+    const definition = _chunkLMJHBF26cjs.lookupInRegistry.call(void 0, 
+      this.#registryConfig,
+      actorConfig.name
+    );
     handler.actor = definition.instantiate();
     await handler.actor.start(
       this,
@@ -1659,7 +1719,7 @@ var EngineActorDriver = class {
     }
     logger4().debug({ msg: "runner actor stopped", actorId });
   }
-  async #runnerFetch(actorId, request) {
+  async #runnerFetch(runner, actorId, request) {
     logger4().debug({
       msg: "runner fetch",
       actorId,
@@ -1668,31 +1728,31 @@ var EngineActorDriver = class {
     });
     return await this.#actorRouter.fetch(request, { actorId });
   }
-  async #runnerWebSocket(actorId, websocketRaw, request) {
+  async #runnerWebSocket(runner, actorId, websocketRaw, request) {
     const websocket = websocketRaw;
     logger4().debug({ msg: "runner websocket", actorId, url: request.url });
     const url = new URL(request.url);
     const protocols = request.headers.get("sec-websocket-protocol");
-    if (protocols === null)
-      throw new Error(`Missing sec-websocket-protocol header`);
     let encodingRaw;
     let connParamsRaw;
     if (protocols) {
       const protocolList = protocols.split(",").map((p) => p.trim());
       for (const protocol of protocolList) {
-        if (protocol.startsWith(_chunkPV22ZBDEcjs.WS_PROTOCOL_ENCODING)) {
-          encodingRaw = protocol.substring(_chunkPV22ZBDEcjs.WS_PROTOCOL_ENCODING.length);
-        } else if (protocol.startsWith(_chunkPV22ZBDEcjs.WS_PROTOCOL_CONN_PARAMS)) {
+        if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_ENCODING)) {
+          encodingRaw = protocol.substring(
+            _chunkJKOUXDK6cjs.WS_PROTOCOL_ENCODING.length
+          );
+        } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_PARAMS)) {
           connParamsRaw = decodeURIComponent(
-            protocol.substring(_chunkPV22ZBDEcjs.WS_PROTOCOL_CONN_PARAMS.length)
+            protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_PARAMS.length)
           );
         }
       }
     }
-    const encoding = _chunkPV22ZBDEcjs.EncodingSchema.parse(encodingRaw);
+    const encoding = _chunkJKOUXDK6cjs.EncodingSchema.parse(encodingRaw);
     const connParams = connParamsRaw ? JSON.parse(connParamsRaw) : void 0;
     let wsHandlerPromise;
-    if (url.pathname === _chunkPV22ZBDEcjs.PATH_CONNECT_WEBSOCKET) {
+    if (url.pathname === _chunkJKOUXDK6cjs.PATH_CONNECT_WEBSOCKET) {
       wsHandlerPromise = handleWebSocketConnect(
         request,
         this.#runConfig,
@@ -1704,7 +1764,7 @@ var EngineActorDriver = class {
         void 0,
         void 0
       );
-    } else if (url.pathname.startsWith(_chunkPV22ZBDEcjs.PATH_RAW_WEBSOCKET_PREFIX)) {
+    } else if (url.pathname.startsWith(_chunkJKOUXDK6cjs.PATH_RAW_WEBSOCKET_PREFIX)) {
       wsHandlerPromise = handleRawWebSocketHandler(
         request,
         url.pathname + url.search,
@@ -1720,10 +1780,12 @@ var EngineActorDriver = class {
       wsContext.close(1011, `${err}`);
     });
     if (websocket.readyState === 1) {
-      wsHandlerPromise.then((x) => {
-        var _a;
-        return (_a = x.onOpen) == null ? void 0 : _a.call(x, new Event("open"), wsContext);
-      });
+      wsHandlerPromise.then(
+        (x) => {
+          var _a;
+          return (_a = x.onOpen) == null ? void 0 : _a.call(x, new Event("open"), wsContext);
+        }
+      );
     } else {
       websocket.addEventListener("open", (event) => {
         wsHandlerPromise.then((x) => {
@@ -1759,13 +1821,18 @@ var EngineActorDriver = class {
     await this.#runner.shutdown(immediate);
   }
   async serverlessHandleStart(c) {
-    await this.#runnerStarted.promise;
     return _streaming.streamSSE.call(void 0, c, async (stream) => {
-      stream.onAbort(() => this.shutdown(true));
+      stream.onAbort(() => {
+      });
+      c.req.raw.signal.addEventListener("abort", () => {
+        logger4().debug("SSE aborted, shutting down runner");
+        this.shutdown(true);
+      });
+      await this.#runnerStarted.promise;
       const payload = this.#runner.getServerlessInitPacket();
       _invariant2.default.call(void 0, payload, "runnerId not set");
       await stream.writeSSE({ data: payload });
-      return this.#runnerStopped.promise;
+      await this.#runnerStopped.promise;
     });
   }
 };
@@ -1775,7 +1842,7 @@ function createEngineDriver() {
   return {
     name: "engine",
     manager: (_registryConfig, runConfig) => {
-      return new (0, _chunkJZD6FEOEcjs.RemoteManagerDriver)(runConfig);
+      return new (0, _chunkLMJHBF26cjs.RemoteManagerDriver)(runConfig);
     },
     actor: (registryConfig, runConfig, managerDriver, inlineClient) => {
       return new EngineActorDriver(
@@ -1829,7 +1896,7 @@ var FileSystemActorDriver = class {
     const state = await this.#state.loadActorStateOrError(actorId);
     await this.#state.writeActor(actorId, {
       ...state,
-      persistedData: _chunkKUZWEM23cjs.bufferToArrayBuffer.call(void 0, data)
+      persistedData: _chunkELDFBXDVcjs.bufferToArrayBuffer.call(void 0, data)
     });
   }
   async setAlarm(actor2, timestamp) {
@@ -1932,13 +1999,13 @@ function decodeActorAlarm(bytes) {
 // src/schemas/file-system-driver/versioned.ts
 var CURRENT_VERSION = 1;
 var migrations = /* @__PURE__ */ new Map();
-var ACTOR_STATE_VERSIONED = _chunkFYP3TZXDcjs.createVersionedDataHandler.call(void 0, {
+var ACTOR_STATE_VERSIONED = _chunkFDJ3AVNBcjs.createVersionedDataHandler.call(void 0, {
   currentVersion: CURRENT_VERSION,
   migrations,
   serializeVersion: (data) => encodeActorState(data),
   deserializeVersion: (bytes) => decodeActorState(bytes)
 });
-var ACTOR_ALARM_VERSIONED = _chunkFYP3TZXDcjs.createVersionedDataHandler.call(void 0, {
+var ACTOR_ALARM_VERSIONED = _chunkFDJ3AVNBcjs.createVersionedDataHandler.call(void 0, {
   currentVersion: CURRENT_VERSION,
   migrations,
   serializeVersion: (data) => encodeActorAlarm(data),
@@ -1947,7 +2014,7 @@ var ACTOR_ALARM_VERSIONED = _chunkFYP3TZXDcjs.createVersionedDataHandler.call(vo
 
 // src/drivers/file-system/log.ts
 function logger5() {
-  return _chunkRJVSNJO7cjs.getLogger.call(void 0, "driver-fs");
+  return _chunkHN7UXCYQcjs.getLogger.call(void 0, "driver-fs");
 }
 
 // src/drivers/file-system/utils.ts
@@ -2001,7 +2068,12 @@ function getDataPath(appName) {
         appName
       );
     case "darwin":
-      return path.join(homeDir, "Library", "Application Support", appName);
+      return path.join(
+        homeDir,
+        "Library",
+        "Application Support",
+        appName
+      );
     default:
       return path.join(
         process.env.XDG_DATA_HOME || path.join(homeDir, ".local", "share"),
@@ -2053,7 +2125,10 @@ var FileSystemGlobalState = class {
       try {
         this.#cleanupTempFilesSync();
       } catch (err) {
-        logger5().error({ msg: "failed to cleanup temp files", error: err });
+        logger5().error({
+          msg: "failed to cleanup temp files",
+          error: err
+        });
       }
     } else {
       logger5().debug({ msg: "memory driver ready" });
@@ -2083,7 +2158,11 @@ var FileSystemGlobalState = class {
         const state = await this.loadActorStateOrError(actorId);
         yield state;
       } catch (error) {
-        logger5().error({ msg: "failed to load actor state", actorId, error });
+        logger5().error({
+          msg: "failed to load actor state",
+          actorId,
+          error
+        });
       }
     }
   }
@@ -2117,7 +2196,9 @@ var FileSystemGlobalState = class {
       name,
       key,
       createdAt: BigInt(Date.now()),
-      persistedData: _chunkKUZWEM23cjs.bufferToArrayBuffer.call(void 0, _chunkFYP3TZXDcjs.serializeEmptyPersistData.call(void 0, input))
+      persistedData: _chunkELDFBXDVcjs.bufferToArrayBuffer.call(void 0, 
+        _chunkFDJ3AVNBcjs.serializeEmptyPersistData.call(void 0, input)
+      )
     };
     await this.writeActor(actorId, entry.state);
     return entry;
@@ -2153,7 +2234,9 @@ var FileSystemGlobalState = class {
         entry.loadPromise = void 0;
         return entry;
       }
-      const error = new Error(`Failed to load actor state: ${innerError}`);
+      const error = new Error(
+        `Failed to load actor state: ${innerError}`
+      );
       throw error;
     }
   }
@@ -2165,7 +2248,9 @@ var FileSystemGlobalState = class {
         name,
         key,
         createdAt: BigInt(Date.now()),
-        persistedData: _chunkKUZWEM23cjs.bufferToArrayBuffer.call(void 0, _chunkFYP3TZXDcjs.serializeEmptyPersistData.call(void 0, input))
+        persistedData: _chunkELDFBXDVcjs.bufferToArrayBuffer.call(void 0, 
+          _chunkFDJ3AVNBcjs.serializeEmptyPersistData.call(void 0, input)
+        )
       };
       await this.writeActor(actorId, entry.state);
     }
@@ -2180,7 +2265,8 @@ var FileSystemGlobalState = class {
     const actor2 = this.#actors.get(actorId);
     _invariant2.default.call(void 0, actor2, `tried to sleep ${actorId}, does not exist`);
     if (actor2.loadPromise) await actor2.loadPromise.catch();
-    if ((_a = actor2.startPromise) == null ? void 0 : _a.promise) await actor2.startPromise.promise.catch();
+    if ((_a = actor2.startPromise) == null ? void 0 : _a.promise)
+      await actor2.startPromise.promise.catch();
     actor2.removed = true;
     _invariant2.default.call(void 0, actor2.actor, "actor should be loaded");
     await actor2.actor._stop();
@@ -2209,7 +2295,9 @@ var FileSystemGlobalState = class {
           actorId,
           timestamp: BigInt(timestamp)
         };
-        const data = ACTOR_ALARM_VERSIONED.serializeWithEmbeddedVersion(alarmData);
+        const data = ACTOR_ALARM_VERSIONED.serializeWithEmbeddedVersion(
+          alarmData
+        );
         await fs2.writeFile(tempPath, data);
         await fs2.rename(tempPath, alarmPath);
       } catch (error) {
@@ -2217,7 +2305,11 @@ var FileSystemGlobalState = class {
           await fs2.unlink(tempPath);
         } catch (e2) {
         }
-        logger5().error({ msg: "failed to write alarm", actorId, error });
+        logger5().error({
+          msg: "failed to write alarm",
+          actorId,
+          error
+        });
         throw new Error(`Failed to write alarm: ${error}`);
       }
     }
@@ -2246,7 +2338,11 @@ var FileSystemGlobalState = class {
         await fs2.unlink(tempPath);
       } catch (e3) {
       }
-      logger5().error({ msg: "failed to save actor state", actorId, error });
+      logger5().error({
+        msg: "failed to save actor state",
+        actorId,
+        error
+      });
       throw new Error(`Failed to save actor state: ${error}`);
     }
   }
@@ -2270,7 +2366,10 @@ var FileSystemGlobalState = class {
     try {
       this.#loadAlarmsSync();
     } catch (err) {
-      logger5().error({ msg: "failed to load alarms on startup", error: err });
+      logger5().error({
+        msg: "failed to load alarms on startup",
+        error: err
+      });
     }
   }
   async startActor(registryConfig, runConfig, inlineClient, actorDriver, actorId) {
@@ -2289,9 +2388,12 @@ var FileSystemGlobalState = class {
     if (entry.actor) {
       return entry.actor;
     }
-    entry.startPromise = _chunkKUZWEM23cjs.promiseWithResolvers.call(void 0, );
+    entry.startPromise = _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, );
     try {
-      const definition = _chunkJZD6FEOEcjs.lookupInRegistry.call(void 0, registryConfig, entry.state.name);
+      const definition = _chunkLMJHBF26cjs.lookupInRegistry.call(void 0, 
+        registryConfig,
+        entry.state.name
+      );
       entry.actor = definition.instantiate();
       await entry.actor.start(
         actorDriver,
@@ -2343,20 +2445,29 @@ var FileSystemGlobalState = class {
           );
           const timestamp = Number(alarmData.timestamp);
           if (Number.isFinite(timestamp)) {
-            this.#scheduleAlarmTimeout(alarmData.actorId, timestamp);
+            this.#scheduleAlarmTimeout(
+              alarmData.actorId,
+              timestamp
+            );
           } else {
-            logger5().debug({ msg: "invalid alarm file contents", file });
+            logger5().debug({
+              msg: "invalid alarm file contents",
+              file
+            });
           }
         } catch (err) {
           logger5().error({
             msg: "failed to read alarm file",
             file,
-            error: _chunkKUZWEM23cjs.stringifyError.call(void 0, err)
+            error: _chunkELDFBXDVcjs.stringifyError.call(void 0, err)
           });
         }
       }
     } catch (err) {
-      logger5().error({ msg: "failed to list alarms directory", error: err });
+      logger5().error({
+        msg: "failed to list alarms directory",
+        error: err
+      });
     }
   }
   /**
@@ -2378,7 +2489,7 @@ var FileSystemGlobalState = class {
     (_a = entry.alarmTimeout) == null ? void 0 : _a.abort();
     entry.alarmTimestamp = timestamp;
     const delay = Math.max(0, timestamp - Date.now());
-    entry.alarmTimeout = _chunkKUZWEM23cjs.setLongTimeout.call(void 0, async () => {
+    entry.alarmTimeout = _chunkELDFBXDVcjs.setLongTimeout.call(void 0, async () => {
       entry.alarmTimestamp = void 0;
       if (this.#persist) {
         try {
@@ -2388,7 +2499,7 @@ var FileSystemGlobalState = class {
             logger5().debug({
               msg: "failed to remove alarm file",
               actorId,
-              error: _chunkKUZWEM23cjs.stringifyError.call(void 0, err)
+              error: _chunkELDFBXDVcjs.stringifyError.call(void 0, err)
             });
           }
         }
@@ -2396,7 +2507,8 @@ var FileSystemGlobalState = class {
       try {
         logger5().debug({ msg: "triggering alarm", actorId, timestamp });
         const loaded = await this.loadActor(actorId);
-        if (!loaded.state) throw new Error(`Actor does not exist: ${actorId}`);
+        if (!loaded.state)
+          throw new Error(`Actor does not exist: ${actorId}`);
         const runnerParams = this.#runnerParams;
         _invariant2.default.call(void 0, runnerParams, "missing runner params");
         if (!loaded.actor) {
@@ -2414,7 +2526,7 @@ var FileSystemGlobalState = class {
         logger5().error({
           msg: "failed to handle alarm",
           actorId,
-          error: _chunkKUZWEM23cjs.stringifyError.call(void 0, err)
+          error: _chunkELDFBXDVcjs.stringifyError.call(void 0, err)
         });
       }
     }, delay);
@@ -2424,7 +2536,7 @@ var FileSystemGlobalState = class {
     if (fsSync2.existsSync(tokenPath)) {
       return fsSync2.readFileSync(tokenPath, "utf-8");
     }
-    const newToken = _chunkPV22ZBDEcjs.generateRandomString.call(void 0, );
+    const newToken = _chunkJKOUXDK6cjs.generateRandomString.call(void 0, );
     fsSync2.writeFileSync(tokenPath, newToken);
     return newToken;
   }
@@ -2486,10 +2598,13 @@ function createManagerInspectorRouter() {
       });
       return c.json(actors, 200);
     } catch (error) {
-      _chunkDUOTOMP7cjs.inspectorLogger.call(void 0, ).error({ msg: "Failed to fetch actors", error });
+      _chunkZNWE3XBTcjs.inspectorLogger.call(void 0, ).error({
+        msg: "Failed to fetch actors",
+        error
+      });
       return c.json("Failed to fetch actors", 500);
     }
-  }).post("/actors", _standardvalidator.sValidator.call(void 0, "json", _chunkZODINJWNcjs.CreateActorSchema), async (c) => {
+  }).post("/actors", _standardvalidator.sValidator.call(void 0, "json", _chunk65SAIRRYcjs.CreateActorSchema), async (c) => {
     const actor2 = await c.var.inspector.accessors.createActor(
       c.req.valid("json")
     );
@@ -2515,7 +2630,7 @@ var ManagerInspector = class {
   
   constructor(accessors) {
     this.accessors = accessors();
-    _chunkDUOTOMP7cjs.inspectorLogger.call(void 0, ).debug({ msg: "Manager Inspector enabled and ready" });
+    _chunkZNWE3XBTcjs.inspectorLogger.call(void 0, ).debug({ msg: "Manager Inspector enabled and ready" });
   }
 };
 
@@ -2540,7 +2655,9 @@ var FileSystemManagerDriver = class {
           name: actorState.name,
           key: actorState.key,
           startedAt,
-          createdAt: new Date(Number(actorState.createdAt)).toISOString(),
+          createdAt: new Date(
+            Number(actorState.createdAt)
+          ).toISOString(),
           features: [
             "state" /* State */,
             "connections" /* Connections */,
@@ -2574,14 +2691,18 @@ var FileSystemManagerDriver = class {
             }
           },
           getBuilds: async () => {
-            return Object.keys(this.#registryConfig.use).map((name) => ({
-              name
-            }));
+            return Object.keys(this.#registryConfig.use).map(
+              (name) => ({
+                name
+              })
+            );
           },
           createActor: async (input) => {
             const { actorId } = await this.createActor(input);
             try {
-              const result = await this.#state.loadActorStateOrError(actorId);
+              const result = await this.#state.loadActorStateOrError(
+                actorId
+              );
               return transformActor2(result);
             } catch (e5) {
               return null;
@@ -2590,9 +2711,9 @@ var FileSystemManagerDriver = class {
         };
       });
     }
-    const inlineClient = _chunkJZD6FEOEcjs.createClientWithDriver.call(void 0, 
+    const inlineClient = _chunkLMJHBF26cjs.createClientWithDriver.call(void 0, 
       this,
-      _chunkFYP3TZXDcjs.ClientConfigSchema.parse({})
+      _chunkFDJ3AVNBcjs.ClientConfigSchema.parse({})
     );
     this.#actorDriver = this.#driverConfig.actor(
       registryConfig,
@@ -2614,7 +2735,7 @@ var FileSystemManagerDriver = class {
   async openWebSocket(path4, actorId, encoding, params, connId, connToken) {
     const pathOnly = path4.split("?")[0];
     const normalizedPath = pathOnly.startsWith("/") ? pathOnly : `/${pathOnly}`;
-    if (normalizedPath === _chunkPV22ZBDEcjs.PATH_CONNECT_WEBSOCKET) {
+    if (normalizedPath === _chunkJKOUXDK6cjs.PATH_CONNECT_WEBSOCKET) {
       const wsHandler = await handleWebSocketConnect(
         void 0,
         this.#runConfig,
@@ -2626,7 +2747,7 @@ var FileSystemManagerDriver = class {
         connToken
       );
       return new InlineWebSocketAdapter2(wsHandler);
-    } else if (normalizedPath.startsWith(_chunkPV22ZBDEcjs.PATH_RAW_WEBSOCKET_PREFIX) || normalizedPath === "/raw/websocket") {
+    } else if (normalizedPath.startsWith(_chunkJKOUXDK6cjs.PATH_RAW_WEBSOCKET_PREFIX) || normalizedPath === "/raw/websocket") {
       const wsHandler = await handleRawWebSocketHandler(
         void 0,
         path4,
@@ -2649,7 +2770,7 @@ var FileSystemManagerDriver = class {
     _invariant2.default.call(void 0, upgradeWebSocket, "missing getUpgradeWebSocket");
     const pathOnly = path4.split("?")[0];
     const normalizedPath = pathOnly.startsWith("/") ? pathOnly : `/${pathOnly}`;
-    if (normalizedPath === _chunkPV22ZBDEcjs.PATH_CONNECT_WEBSOCKET) {
+    if (normalizedPath === _chunkJKOUXDK6cjs.PATH_CONNECT_WEBSOCKET) {
       const wsHandler = await handleWebSocketConnect(
         c.req.raw,
         this.#runConfig,
@@ -2660,20 +2781,22 @@ var FileSystemManagerDriver = class {
         connId,
         connToken
       );
-      return upgradeWebSocket(() => wsHandler)(c, _chunkKUZWEM23cjs.noopNext.call(void 0, ));
-    } else if (normalizedPath.startsWith(_chunkPV22ZBDEcjs.PATH_RAW_WEBSOCKET_PREFIX) || normalizedPath === "/raw/websocket") {
+      return upgradeWebSocket(() => wsHandler)(c, _chunkELDFBXDVcjs.noopNext.call(void 0, ));
+    } else if (normalizedPath.startsWith(_chunkJKOUXDK6cjs.PATH_RAW_WEBSOCKET_PREFIX) || normalizedPath === "/raw/websocket") {
       const wsHandler = await handleRawWebSocketHandler(
         c.req.raw,
         path4,
         this.#actorDriver,
         actorId
       );
-      return upgradeWebSocket(() => wsHandler)(c, _chunkKUZWEM23cjs.noopNext.call(void 0, ));
+      return upgradeWebSocket(() => wsHandler)(c, _chunkELDFBXDVcjs.noopNext.call(void 0, ));
     } else {
       throw new Error(`Unreachable path: ${path4}`);
     }
   }
-  async getForId({ actorId }) {
+  async getForId({
+    actorId
+  }) {
     const actor2 = await this.#state.loadActor(actorId);
     if (!actor2.state) {
       return void 0;
@@ -2685,7 +2808,11 @@ var FileSystemManagerDriver = class {
         key: actor2.state.key
       };
     } catch (error) {
-      logger5().error({ msg: "failed to read actor state", actorId, error });
+      logger5().error({
+        msg: "failed to read actor state",
+        actorId,
+        error
+      });
       return void 0;
     }
   }
@@ -2767,7 +2894,12 @@ function createFileSystemOrMemoryDriver(persist = true, customPath) {
         inlineClient,
         state
       );
-      state.onRunnerStart(registryConfig, runConfig, inlineClient, actorDriver);
+      state.onRunnerStart(
+        registryConfig,
+        runConfig,
+        inlineClient,
+        actorDriver
+      );
       return actorDriver;
     }
   };
@@ -2794,13 +2926,13 @@ function chooseDefaultDriver(runConfig) {
     return runConfig.driver;
   }
   if (runConfig.endpoint || runConfig.token || runConfig.runnerKind === "serverless") {
-    _chunkPV22ZBDEcjs.loggerWithoutContext.call(void 0, ).debug({
+    _chunkJKOUXDK6cjs.loggerWithoutContext.call(void 0, ).debug({
       msg: "using rivet engine driver",
       endpoint: runConfig.endpoint
     });
     return createEngineDriver();
   }
-  _chunkPV22ZBDEcjs.loggerWithoutContext.call(void 0, ).debug({ msg: "using default file system driver" });
+  _chunkJKOUXDK6cjs.loggerWithoutContext.call(void 0, ).debug({ msg: "using default file system driver" });
   return createFileSystemOrMemoryDriver(true);
 }
 
@@ -2814,7 +2946,7 @@ var _promises2 = require('stream/promises');
 
 // src/engine-process/log.ts
 function logger6() {
-  return _chunkRJVSNJO7cjs.getLogger.call(void 0, "engine-process");
+  return _chunkHN7UXCYQcjs.getLogger.call(void 0, "engine-process");
 }
 
 // src/engine-process/mod.ts
@@ -2823,7 +2955,10 @@ var ENGINE_ENDPOINT = `http://localhost:${ENGINE_PORT}`;
 var ENGINE_BASE_URL = "https://releases.rivet.gg/engine";
 var ENGINE_BINARY_NAME = "rivet-engine";
 async function ensureEngineProcess(options) {
-  logger6().debug({ msg: "ensuring engine process", version: options.version });
+  logger6().debug({
+    msg: "ensuring engine process",
+    version: options.version
+  });
   const storageRoot = getStoragePath();
   const binDir = path3.join(storageRoot, "bin");
   const varDir = path3.join(storageRoot, "var");
@@ -3003,12 +3138,18 @@ function resolveTargetTripletFor(platform, arch) {
       break;
     case "linux":
       if (arch === "x64") {
-        return { targetTriplet: "x86_64-unknown-linux-musl", extension: "" };
+        return {
+          targetTriplet: "x86_64-unknown-linux-musl",
+          extension: ""
+        };
       }
       break;
     case "win32":
       if (arch === "x64") {
-        return { targetTriplet: "x86_64-pc-windows-gnu", extension: ".exe" };
+        return {
+          targetTriplet: "x86_64-pc-windows-gnu",
+          extension: ".exe"
+        };
       }
       break;
   }
@@ -3083,7 +3224,9 @@ async function waitForEngineHealth() {
         attempt: i + 1,
         maxRetries
       });
-      await new Promise((resolve) => setTimeout(resolve, HEALTH_INTERVAL));
+      await new Promise(
+        (resolve) => setTimeout(resolve, HEALTH_INTERVAL)
+      );
     }
   }
   throw new Error(`engine health check failed after ${maxRetries} retries`);
@@ -3124,6 +3267,7 @@ var ActorsListResponseSchema = _zod.z.object({
   actors: _zod.z.array(ActorSchema)
 });
 var ActorsCreateRequestSchema = _zod.z.object({
+  datacenter: _zod.z.string().optional(),
   name: _zod.z.string(),
   runner_name_selector: _zod.z.string(),
   crash_policy: _zod.z.string(),
@@ -3134,6 +3278,7 @@ var ActorsCreateResponseSchema = _zod.z.object({
   actor: ActorSchema
 });
 var ActorsGetOrCreateRequestSchema = _zod.z.object({
+  datacenter: _zod.z.string().optional(),
   name: _zod.z.string(),
   key: _zod.z.string(),
   runner_name_selector: _zod.z.string(),
@@ -3147,6 +3292,76 @@ var ActorsGetOrCreateResponseSchema = _zod.z.object({
 var ActorsDeleteResponseSchema = _zod.z.object({});
 
 // src/manager/gateway.ts
+async function handleWebSocketGatewayPathBased(runConfig, managerDriver, c, actorPathInfo) {
+  var _a;
+  const upgradeWebSocket = (_a = runConfig.getUpgradeWebSocket) == null ? void 0 : _a.call(runConfig);
+  if (!upgradeWebSocket) {
+    throw new (0, _chunkKSRXX3Z4cjs.WebSocketsNotEnabled)();
+  }
+  const protocols = c.req.header("sec-websocket-protocol");
+  let encodingRaw;
+  let connParamsRaw;
+  let connIdRaw;
+  let connTokenRaw;
+  if (protocols) {
+    const protocolList = protocols.split(",").map((p) => p.trim());
+    for (const protocol of protocolList) {
+      if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_ENCODING)) {
+        encodingRaw = protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_ENCODING.length);
+      } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_PARAMS)) {
+        connParamsRaw = decodeURIComponent(
+          protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_PARAMS.length)
+        );
+      } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_ID)) {
+        connIdRaw = protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_ID.length);
+      } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_TOKEN)) {
+        connTokenRaw = protocol.substring(
+          _chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_TOKEN.length
+        );
+      }
+    }
+  }
+  logger().debug({
+    msg: "proxying websocket to actor via path-based routing",
+    actorId: actorPathInfo.actorId,
+    path: actorPathInfo.remainingPath,
+    encoding: encodingRaw
+  });
+  const encoding = encodingRaw || "json";
+  const connParams = connParamsRaw ? JSON.parse(connParamsRaw) : void 0;
+  return await managerDriver.proxyWebSocket(
+    c,
+    actorPathInfo.remainingPath,
+    actorPathInfo.actorId,
+    encoding,
+    // Will be validated by driver
+    connParams,
+    connIdRaw,
+    connTokenRaw
+  );
+}
+async function handleHttpGatewayPathBased(managerDriver, c, actorPathInfo) {
+  logger().debug({
+    msg: "proxying request to actor via path-based routing",
+    actorId: actorPathInfo.actorId,
+    path: actorPathInfo.remainingPath,
+    method: c.req.method
+  });
+  const proxyHeaders = new Headers(c.req.raw.headers);
+  const proxyUrl = new URL(`http://actor${actorPathInfo.remainingPath}`);
+  const proxyRequest = new Request(proxyUrl, {
+    method: c.req.raw.method,
+    headers: proxyHeaders,
+    body: c.req.raw.body,
+    signal: c.req.raw.signal,
+    duplex: "half"
+  });
+  return await managerDriver.proxyRequest(
+    c,
+    proxyRequest,
+    actorPathInfo.actorId
+  );
+}
 async function actorGateway(runConfig, managerDriver, c, next) {
   if (c.req.path.startsWith("/.test/")) {
     return next();
@@ -3158,6 +3373,28 @@ async function actorGateway(runConfig, managerDriver, c, next) {
       strippedPath = "/" + strippedPath;
     }
   }
+  const pathWithQuery = c.req.url.includes("?") ? strippedPath + c.req.url.substring(c.req.url.indexOf("?")) : strippedPath;
+  const actorPathInfo = parseActorPath(pathWithQuery);
+  if (actorPathInfo) {
+    logger().debug({
+      msg: "routing using path-based actor routing",
+      actorPathInfo
+    });
+    const isWebSocket = c.req.header("upgrade") === "websocket";
+    if (isWebSocket) {
+      return await handleWebSocketGatewayPathBased(
+        runConfig,
+        managerDriver,
+        c,
+        actorPathInfo
+      );
+    }
+    return await handleHttpGatewayPathBased(
+      managerDriver,
+      c,
+      actorPathInfo
+    );
+  }
   if (c.req.header("upgrade") === "websocket") {
     return await handleWebSocketGateway(
       runConfig,
@@ -3184,20 +3421,22 @@ async function handleWebSocketGateway(runConfig, managerDriver, c, strippedPath)
   if (protocols) {
     const protocolList = protocols.split(",").map((p) => p.trim());
     for (const protocol of protocolList) {
-      if (protocol.startsWith(_chunkPV22ZBDEcjs.WS_PROTOCOL_TARGET)) {
-        target = protocol.substring(_chunkPV22ZBDEcjs.WS_PROTOCOL_TARGET.length);
-      } else if (protocol.startsWith(_chunkPV22ZBDEcjs.WS_PROTOCOL_ACTOR)) {
-        actorId = protocol.substring(_chunkPV22ZBDEcjs.WS_PROTOCOL_ACTOR.length);
-      } else if (protocol.startsWith(_chunkPV22ZBDEcjs.WS_PROTOCOL_ENCODING)) {
-        encodingRaw = protocol.substring(_chunkPV22ZBDEcjs.WS_PROTOCOL_ENCODING.length);
-      } else if (protocol.startsWith(_chunkPV22ZBDEcjs.WS_PROTOCOL_CONN_PARAMS)) {
+      if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_TARGET)) {
+        target = protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_TARGET.length);
+      } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_ACTOR)) {
+        actorId = protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_ACTOR.length);
+      } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_ENCODING)) {
+        encodingRaw = protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_ENCODING.length);
+      } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_PARAMS)) {
         connParamsRaw = decodeURIComponent(
-          protocol.substring(_chunkPV22ZBDEcjs.WS_PROTOCOL_CONN_PARAMS.length)
+          protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_PARAMS.length)
+        );
+      } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_ID)) {
+        connIdRaw = protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_ID.length);
+      } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_TOKEN)) {
+        connTokenRaw = protocol.substring(
+          _chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_TOKEN.length
         );
-      } else if (protocol.startsWith(_chunkPV22ZBDEcjs.WS_PROTOCOL_CONN_ID)) {
-        connIdRaw = protocol.substring(_chunkPV22ZBDEcjs.WS_PROTOCOL_CONN_ID.length);
-      } else if (protocol.startsWith(_chunkPV22ZBDEcjs.WS_PROTOCOL_CONN_TOKEN)) {
-        connTokenRaw = protocol.substring(_chunkPV22ZBDEcjs.WS_PROTOCOL_CONN_TOKEN.length);
       }
     }
   }
@@ -3228,8 +3467,8 @@ async function handleWebSocketGateway(runConfig, managerDriver, c, strippedPath)
   );
 }
 async function handleHttpGateway(managerDriver, c, next, strippedPath) {
-  const target = c.req.header(_chunkPV22ZBDEcjs.HEADER_RIVET_TARGET);
-  const actorId = c.req.header(_chunkPV22ZBDEcjs.HEADER_RIVET_ACTOR);
+  const target = c.req.header(_chunkJKOUXDK6cjs.HEADER_RIVET_TARGET);
+  const actorId = c.req.header(_chunkJKOUXDK6cjs.HEADER_RIVET_ACTOR);
   if (target !== "actor") {
     return next();
   }
@@ -3243,8 +3482,8 @@ async function handleHttpGateway(managerDriver, c, next, strippedPath) {
     method: c.req.method
   });
   const proxyHeaders = new Headers(c.req.raw.headers);
-  proxyHeaders.delete(_chunkPV22ZBDEcjs.HEADER_RIVET_TARGET);
-  proxyHeaders.delete(_chunkPV22ZBDEcjs.HEADER_RIVET_ACTOR);
+  proxyHeaders.delete(_chunkJKOUXDK6cjs.HEADER_RIVET_TARGET);
+  proxyHeaders.delete(_chunkJKOUXDK6cjs.HEADER_RIVET_ACTOR);
   const url = new URL(c.req.url);
   const proxyUrl = new URL(`http://actor${strippedPath}${url.search}`);
   const proxyRequest = new Request(proxyUrl, {
@@ -3256,13 +3495,80 @@ async function handleHttpGateway(managerDriver, c, next, strippedPath) {
   });
   return await managerDriver.proxyRequest(c, proxyRequest, actorId);
 }
+function parseActorPath(path4) {
+  const queryPos = path4.indexOf("?");
+  const fragmentPos = path4.indexOf("#");
+  let queryString = "";
+  if (queryPos !== -1) {
+    if (fragmentPos !== -1 && queryPos < fragmentPos) {
+      queryString = path4.slice(queryPos, fragmentPos);
+    } else {
+      queryString = path4.slice(queryPos);
+    }
+  }
+  let basePath = path4;
+  if (queryPos !== -1) {
+    basePath = path4.slice(0, queryPos);
+  } else if (fragmentPos !== -1) {
+    basePath = path4.slice(0, fragmentPos);
+  }
+  if (basePath.includes("//")) {
+    return null;
+  }
+  const segments = basePath.split("/").filter((s) => s.length > 0);
+  if (segments.length < 4) {
+    return null;
+  }
+  if (segments[0] !== "gateway" || segments[1] !== "actors") {
+    return null;
+  }
+  if (segments[2].length === 0) {
+    return null;
+  }
+  const actorId = segments[2];
+  let token;
+  let remainingPathStartIdx;
+  if (segments.length >= 6 && segments[3] === "tokens" && segments[5] === "route") {
+    if (segments[4].length === 0) {
+      return null;
+    }
+    token = segments[4];
+    remainingPathStartIdx = 6;
+  } else if (segments.length >= 4 && segments[3] === "route") {
+    token = void 0;
+    remainingPathStartIdx = 4;
+  } else {
+    return null;
+  }
+  let prefixLen = 0;
+  for (let i = 0; i < remainingPathStartIdx; i++) {
+    prefixLen += 1 + segments[i].length;
+  }
+  let remainingBase;
+  if (prefixLen < basePath.length) {
+    remainingBase = basePath.slice(prefixLen);
+  } else {
+    remainingBase = "/";
+  }
+  let remainingPath;
+  if (remainingBase.length === 0 || !remainingBase.startsWith("/")) {
+    remainingPath = `/${remainingBase}${queryString}`;
+  } else {
+    remainingPath = `${remainingBase}${queryString}`;
+  }
+  return {
+    actorId,
+    token,
+    remainingPath
+  };
+}
 async function createTestWebSocketProxy(clientWsPromise) {
   let clientWs = null;
   const {
     promise: serverWsPromise,
     resolve: serverWsResolve,
     reject: serverWsReject
-  } = _chunkKUZWEM23cjs.promiseWithResolvers.call(void 0, );
+  } = _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, );
   try {
     logger().debug({ msg: "awaiting client websocket promise" });
     const ws = await clientWsPromise;
@@ -3273,13 +3579,20 @@ async function createTestWebSocketProxy(clientWsPromise) {
     });
     await new Promise((resolve, reject) => {
       const onOpen = () => {
-        logger().debug({ msg: "test websocket connection to actor opened" });
+        logger().debug({
+          msg: "test websocket connection to actor opened"
+        });
         resolve();
       };
       const onError = (error) => {
-        logger().error({ msg: "test websocket connection failed", error });
+        logger().error({
+          msg: "test websocket connection failed",
+          error
+        });
         reject(
-          new Error(`Failed to open WebSocket: ${error.message || error}`)
+          new Error(
+            `Failed to open WebSocket: ${error.message || error}`
+          )
         );
         serverWsReject();
       };
@@ -3431,7 +3744,9 @@ async function createTestWebSocketProxy(clientWsPromise) {
 // src/manager/router-schema.ts
 
 var ServerlessStartHeadersSchema = _zod.z.object({
-  endpoint: _zod.z.string({ required_error: "x-rivet-endpoint header is required" }),
+  endpoint: _zod.z.string({
+    required_error: "x-rivet-endpoint header is required"
+  }),
   token: _zod.z.string({ invalid_type_error: "x-rivet-token header must be a string" }).optional(),
   totalSlots: _zod.z.coerce.number({
     invalid_type_error: "x-rivet-total-slots header must be a number"
@@ -3440,7 +3755,7 @@ var ServerlessStartHeadersSchema = _zod.z.object({
     required_error: "x-rivet-runner-name header is required"
   }),
   namespace: _zod.z.string({
-    required_error: "x-rivet-namespace-id header is required"
+    required_error: "x-rivet-namespace-name header is required"
   })
 });
 
@@ -3492,7 +3807,7 @@ function createManagerRouter(registryConfig, runConfig, managerDriver, driverCon
   } else if (runConfig.runnerKind === "normal") {
     addManagerRoutes(registryConfig, runConfig, managerDriver, router);
   } else {
-    _chunkKUZWEM23cjs.assertUnreachable.call(void 0, runConfig.runnerKind);
+    _chunkELDFBXDVcjs.assertUnreachable.call(void 0, runConfig.runnerKind);
   }
   router.notFound(handleRouteNotFound);
   router.onError(handleRouteError);
@@ -3512,7 +3827,7 @@ function addServerlessRoutes(driverConfig, registryConfig, runConfig, managerDri
       token: _nullishCoalesce(c.req.header("x-rivet-token"), () => ( void 0)),
       totalSlots: c.req.header("x-rivet-total-slots"),
       runnerName: c.req.header("x-rivet-runner-name"),
-      namespace: c.req.header("x-rivet-namespace-id")
+      namespace: c.req.header("x-rivet-namespace-name")
     });
     if (!parseResult.success) {
       throw new (0, _chunkKSRXX3Z4cjs.InvalidRequest)(
@@ -3553,13 +3868,13 @@ function addServerlessRoutes(driverConfig, registryConfig, runConfig, managerDri
 }
 function addManagerRoutes(registryConfig, runConfig, managerDriver, router) {
   var _a;
-  if (_chunkDUOTOMP7cjs.isInspectorEnabled.call(void 0, runConfig, "manager")) {
+  if (_chunkZNWE3XBTcjs.isInspectorEnabled.call(void 0, runConfig, "manager")) {
     if (!managerDriver.inspector) {
       throw new (0, _chunkKSRXX3Z4cjs.Unsupported)("inspector");
     }
     router.route(
       "/inspect",
-      new (0, _hono.Hono)().use(_cors.cors.call(void 0, runConfig.inspector.cors)).use(_chunkDUOTOMP7cjs.secureInspector.call(void 0, runConfig)).use((c, next) => {
+      new (0, _hono.Hono)().use(_cors.cors.call(void 0, runConfig.inspector.cors)).use(_chunkZNWE3XBTcjs.secureInspector.call(void 0, runConfig)).use((c, next) => {
         c.set("inspector", managerDriver.inspector);
         return next();
       }).route("/", createManagerInspectorRouter())
@@ -3578,7 +3893,7 @@ function addManagerRoutes(registryConfig, runConfig, managerDriver, router) {
       path: "/actors",
       request: {
         query: _zod.z.object({
-          name: _zod.z.string(),
+          name: _zod.z.string().optional(),
           actor_ids: _zod.z.string().optional(),
           key: _zod.z.string().optional()
         })
@@ -3589,6 +3904,30 @@ function addManagerRoutes(registryConfig, runConfig, managerDriver, router) {
       const { name, actor_ids, key } = c.req.valid("query");
       const actorIdsParsed = actor_ids ? actor_ids.split(",").map((id) => id.trim()).filter((id) => id.length > 0) : void 0;
       const actors = [];
+      if (actorIdsParsed && (name || key)) {
+        return c.json(
+          {
+            error: "Cannot provide both actor_ids and (name + key). Use either actor_ids or (name + key)."
+          },
+          400
+        );
+      }
+      if (key && !name) {
+        return c.json(
+          {
+            error: "When providing 'key', 'name' must also be provided."
+          },
+          400
+        );
+      }
+      if (!actorIdsParsed && !key) {
+        return c.json(
+          {
+            error: "Must provide either 'actor_ids' or both 'name' and 'key'."
+          },
+          400
+        );
+      }
       if (actorIdsParsed) {
         if (actorIdsParsed.length > 32) {
           return c.json(
@@ -3613,6 +3952,20 @@ function addManagerRoutes(registryConfig, runConfig, managerDriver, router) {
             if (actorOutput) {
               actors.push(actorOutput);
             }
+          } else {
+            for (const actorName of Object.keys(
+              registryConfig.use
+            )) {
+              const actorOutput = await managerDriver.getForId({
+                c,
+                name: actorName,
+                actorId
+              });
+              if (actorOutput) {
+                actors.push(actorOutput);
+                break;
+              }
+            }
           }
         }
       } else if (key) {
@@ -3710,7 +4063,14 @@ function addManagerRoutes(registryConfig, runConfig, managerDriver, router) {
   if (registryConfig.test.enabled) {
     router.post(".test/inline-driver/call", async (c) => {
       const buffer = await c.req.arrayBuffer();
-      const { encoding, transport, method, args } = cbor4.decode(new Uint8Array(buffer));
+      const {
+        encoding,
+        transport,
+        method,
+        args
+      } = cbor4.decode(
+        new Uint8Array(buffer)
+      );
       logger().debug({
         msg: "received inline request",
         encoding,
@@ -3720,10 +4080,12 @@ function addManagerRoutes(registryConfig, runConfig, managerDriver, router) {
       });
       let response;
       try {
-        const output = await managerDriver[method](...args);
+        const output = await managerDriver[method](
+          ...args
+        );
         response = { ok: output };
       } catch (rawErr) {
-        const err = _chunkKUZWEM23cjs.deconstructError.call(void 0, rawErr, logger(), {}, true);
+        const err = _chunkELDFBXDVcjs.deconstructError.call(void 0, rawErr, logger(), {}, true);
         response = { err };
       }
       return c.body(cbor4.encode(response));
@@ -3731,7 +4093,10 @@ function addManagerRoutes(registryConfig, runConfig, managerDriver, router) {
     router.get(".test/inline-driver/connect-websocket/*", async (c) => {
       var _a2;
       const upgradeWebSocket = (_a2 = runConfig.getUpgradeWebSocket) == null ? void 0 : _a2.call(runConfig);
-      _invariant2.default.call(void 0, upgradeWebSocket, "websockets not supported on this platform");
+      _invariant2.default.call(void 0, 
+        upgradeWebSocket,
+        "websockets not supported on this platform"
+      );
       return upgradeWebSocket(async (c2) => {
         const protocolHeader = c2.req.header("sec-websocket-protocol") || "";
         const protocols = protocolHeader.split(/,\s*/);
@@ -3743,29 +4108,31 @@ function addManagerRoutes(registryConfig, runConfig, managerDriver, router) {
         let connId;
         let connToken;
         for (const protocol of protocols) {
-          if (protocol.startsWith(_chunkPV22ZBDEcjs.WS_PROTOCOL_ACTOR)) {
-            actorId = protocol.substring(_chunkPV22ZBDEcjs.WS_PROTOCOL_ACTOR.length);
-          } else if (protocol.startsWith(_chunkPV22ZBDEcjs.WS_PROTOCOL_ENCODING)) {
+          if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_ACTOR)) {
+            actorId = protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_ACTOR.length);
+          } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_ENCODING)) {
             encoding = protocol.substring(
-              _chunkPV22ZBDEcjs.WS_PROTOCOL_ENCODING.length
+              _chunkJKOUXDK6cjs.WS_PROTOCOL_ENCODING.length
             );
-          } else if (protocol.startsWith(_chunkPV22ZBDEcjs.WS_PROTOCOL_TRANSPORT)) {
+          } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_TRANSPORT)) {
             transport = protocol.substring(
-              _chunkPV22ZBDEcjs.WS_PROTOCOL_TRANSPORT.length
+              _chunkJKOUXDK6cjs.WS_PROTOCOL_TRANSPORT.length
             );
-          } else if (protocol.startsWith(_chunkPV22ZBDEcjs.WS_PROTOCOL_PATH)) {
+          } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_PATH)) {
             path4 = decodeURIComponent(
-              protocol.substring(_chunkPV22ZBDEcjs.WS_PROTOCOL_PATH.length)
+              protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_PATH.length)
             );
-          } else if (protocol.startsWith(_chunkPV22ZBDEcjs.WS_PROTOCOL_CONN_PARAMS)) {
+          } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_PARAMS)) {
             const paramsRaw = decodeURIComponent(
-              protocol.substring(_chunkPV22ZBDEcjs.WS_PROTOCOL_CONN_PARAMS.length)
+              protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_PARAMS.length)
             );
             params = JSON.parse(paramsRaw);
-          } else if (protocol.startsWith(_chunkPV22ZBDEcjs.WS_PROTOCOL_CONN_ID)) {
-            connId = protocol.substring(_chunkPV22ZBDEcjs.WS_PROTOCOL_CONN_ID.length);
-          } else if (protocol.startsWith(_chunkPV22ZBDEcjs.WS_PROTOCOL_CONN_TOKEN)) {
-            connToken = protocol.substring(_chunkPV22ZBDEcjs.WS_PROTOCOL_CONN_TOKEN.length);
+          } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_ID)) {
+            connId = protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_ID.length);
+          } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_TOKEN)) {
+            connToken = protocol.substring(
+              _chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_TOKEN.length
+            );
           }
         }
         logger().debug({
@@ -3785,10 +4152,10 @@ function addManagerRoutes(registryConfig, runConfig, managerDriver, router) {
           connToken
         );
         return await createTestWebSocketProxy(clientWsPromise);
-      })(c, _chunkKUZWEM23cjs.noopNext.call(void 0, ));
+      })(c, _chunkELDFBXDVcjs.noopNext.call(void 0, ));
     });
     router.all(".test/inline-driver/send-request/*", async (c) => {
-      const actorId = c.req.header(_chunkPV22ZBDEcjs.HEADER_ACTOR_ID);
+      const actorId = c.req.header(_chunkJKOUXDK6cjs.HEADER_ACTOR_ID);
       if (!actorId) {
         return c.text("Missing required headers", 400);
       }
@@ -3815,9 +4182,9 @@ function addManagerRoutes(registryConfig, runConfig, managerDriver, router) {
       } catch (error) {
         logger().error({
           msg: "error in test inline raw http",
-          error: _chunkKUZWEM23cjs.stringifyError.call(void 0, error)
+          error: _chunkELDFBXDVcjs.stringifyError.call(void 0, error)
         });
-        const err = _chunkKUZWEM23cjs.deconstructError.call(void 0, error, logger(), {}, true);
+        const err = _chunkELDFBXDVcjs.deconstructError.call(void 0, error, logger(), {}, true);
         return c.json(
           {
             error: {
@@ -3844,9 +4211,12 @@ function addManagerRoutes(registryConfig, runConfig, managerDriver, router) {
       try {
         const response = await managerDriver.sendRequest(
           actorId,
-          new Request(`http://actor/.test/force-disconnect?conn=${connId}`, {
-            method: "POST"
-          })
+          new Request(
+            `http://actor/.test/force-disconnect?conn=${connId}`,
+            {
+              method: "POST"
+            }
+          )
         );
         if (!response.ok) {
           const text = await response.text();
@@ -3859,7 +4229,7 @@ function addManagerRoutes(registryConfig, runConfig, managerDriver, router) {
       } catch (error) {
         logger().error({
           msg: "error forcing disconnect",
-          error: _chunkKUZWEM23cjs.stringifyError.call(void 0, error)
+          error: _chunkELDFBXDVcjs.stringifyError.call(void 0, error)
         });
         return c.text(`Error: ${error}`, 500);
       }
@@ -3880,7 +4250,7 @@ function createApiActor(actor2, runnerName = "default") {
   return {
     actor_id: actor2.actorId,
     name: actor2.name,
-    key: _chunkJZD6FEOEcjs.serializeActorKey.call(void 0, actor2.key),
+    key: _chunkLMJHBF26cjs.serializeActorKey.call(void 0, actor2.key),
     namespace_id: "default",
     // Assert default namespace
     runner_name_selector: runnerName,
@@ -3894,7 +4264,7 @@ function createApiActor(actor2, runnerName = "default") {
 
 // src/registry/log.ts
 function logger7() {
-  return _chunkRJVSNJO7cjs.getLogger.call(void 0, "registry");
+  return _chunkHN7UXCYQcjs.getLogger.call(void 0, "registry");
 }
 
 // src/registry/serve.ts
@@ -3954,7 +4324,7 @@ var Registry = class {
    */
   start(inputConfig) {
     var _a, _b, _c;
-    const config2 = _chunkFYP3TZXDcjs.RunnerConfigSchema.parse(inputConfig);
+    const config2 = _chunkFDJ3AVNBcjs.RunnerConfigSchema.parse(inputConfig);
     if (config2.autoConfigureServerless && config2.runnerKind !== "serverless") {
       throw new Error(
         "autoConfigureServerless can only be configured when runnerKind is 'serverless'"
@@ -3992,9 +4362,9 @@ var Registry = class {
       config2.disableActorDriver = true;
     }
     if ((_a = config2.logging) == null ? void 0 : _a.baseLogger) {
-      _chunkRJVSNJO7cjs.configureBaseLogger.call(void 0, config2.logging.baseLogger);
+      _chunkHN7UXCYQcjs.configureBaseLogger.call(void 0, config2.logging.baseLogger);
     } else {
-      _chunkRJVSNJO7cjs.configureDefaultLogger.call(void 0, (_b = config2.logging) == null ? void 0 : _b.level);
+      _chunkHN7UXCYQcjs.configureDefaultLogger.call(void 0, (_b = config2.logging) == null ? void 0 : _b.level);
     }
     const driver = chooseDefaultDriver(config2);
     if (driver.name === "engine") {
@@ -4014,8 +4384,8 @@ var Registry = class {
       config2.getUpgradeWebSocket = () => upgradeWebSocket;
     }
     const managerDriver = driver.manager(this.#config, config2);
-    _chunkDUOTOMP7cjs.configureInspectorAccessToken.call(void 0, config2, managerDriver);
-    const client = _chunkJZD6FEOEcjs.createClientWithDriver.call(void 0, managerDriver, config2);
+    _chunkZNWE3XBTcjs.configureInspectorAccessToken.call(void 0, config2, managerDriver);
+    const client = _chunkLMJHBF26cjs.createClientWithDriver.call(void 0, managerDriver, config2);
     const driverLog = _nullishCoalesce(((_c = managerDriver.extraStartupLog) == null ? void 0 : _c.call(managerDriver)), () => ( {}));
     logger7().info({
       msg: "rivetkit ready",
@@ -4023,17 +4393,22 @@ var Registry = class {
       definitions: Object.keys(this.#config.use).length,
       ...driverLog
     });
-    if (_chunkDUOTOMP7cjs.isInspectorEnabled.call(void 0, config2, "manager") && managerDriver.inspector) {
-      logger7().info({ msg: "inspector ready", url: _chunkDUOTOMP7cjs.getInspectorUrl.call(void 0, config2) });
+    if (_chunkZNWE3XBTcjs.isInspectorEnabled.call(void 0, config2, "manager") && managerDriver.inspector) {
+      logger7().info({
+        msg: "inspector ready",
+        url: _chunkZNWE3XBTcjs.getInspectorUrl.call(void 0, config2)
+      });
     }
     if (!config2.noWelcome) {
       const displayInfo = managerDriver.displayInformation();
       console.log();
-      console.log(`  RivetKit ${_chunkKUZWEM23cjs.package_default.version} (${displayInfo.name})`);
+      console.log(`  RivetKit ${_chunkELDFBXDVcjs.package_default.version} (${displayInfo.name})`);
       if (!config2.disableDefaultServer) {
-        console.log(`  - Endpoint:     ${_chunkJZD6FEOEcjs.getEndpoint.call(void 0, config2)}`);
+        console.log(`  - Endpoint:     ${_chunkLMJHBF26cjs.getEndpoint.call(void 0, config2)}`);
       } else if (config2.overrideServerAddress) {
-        console.log(`  - Endpoint:     ${config2.overrideServerAddress}`);
+        console.log(
+          `  - Endpoint:     ${config2.overrideServerAddress}`
+        );
       }
       if (config2.runEngine) {
         const padding = " ".repeat(Math.max(0, 13 - "Engine".length));
@@ -4043,8 +4418,8 @@ var Registry = class {
         const padding = " ".repeat(Math.max(0, 13 - k.length));
         console.log(`  - ${k}:${padding}${v}`);
       }
-      if (_chunkDUOTOMP7cjs.isInspectorEnabled.call(void 0, config2, "manager") && managerDriver.inspector) {
-        console.log(`  - Inspector:    ${_chunkDUOTOMP7cjs.getInspectorUrl.call(void 0, config2)}`);
+      if (_chunkZNWE3XBTcjs.isInspectorEnabled.call(void 0, config2, "manager") && managerDriver.inspector) {
+        console.log(`  - Inspector:    ${_chunkZNWE3XBTcjs.getInspectorUrl.call(void 0, config2)}`);
       }
       console.log();
     }
@@ -4082,13 +4457,19 @@ async function configureServerlessRunner(config2) {
   logger7().debug("configuring serverless runner");
   try {
     if (!config2.runnerName) {
-      throw new Error("runnerName is required for serverless configuration");
+      throw new Error(
+        "runnerName is required for serverless configuration"
+      );
     }
     if (!config2.namespace) {
-      throw new Error("namespace is required for serverless configuration");
+      throw new Error(
+        "namespace is required for serverless configuration"
+      );
     }
     if (!config2.endpoint) {
-      throw new Error("endpoint is required for serverless configuration");
+      throw new Error(
+        "endpoint is required for serverless configuration"
+      );
     }
     const customConfig = typeof config2.autoConfigureServerless === "object" ? config2.autoConfigureServerless : {};
     const clientConfig = {
@@ -4107,7 +4488,7 @@ async function configureServerlessRunner(config2) {
       msg: "fetching datacenters",
       endpoint: config2.endpoint
     });
-    const dcsRes = await _chunkJZD6FEOEcjs.getDatacenters.call(void 0, clientConfig);
+    const dcsRes = await _chunkLMJHBF26cjs.getDatacenters.call(void 0, clientConfig);
     logger7().debug({
       msg: "configuring serverless runner",
       runnerName: config2.runnerName,
@@ -4125,7 +4506,7 @@ async function configureServerlessRunner(config2) {
       },
       metadata: _nullishCoalesce(customConfig.metadata, () => ( {}))
     };
-    await _chunkJZD6FEOEcjs.updateRunnerConfig.call(void 0, clientConfig, config2.runnerName, {
+    await _chunkLMJHBF26cjs.updateRunnerConfig.call(void 0, clientConfig, config2.runnerName, {
       datacenters: Object.fromEntries(
         dcsRes.datacenters.map((dc) => [dc.name, serverlessConfig])
       )
@@ -4163,4 +4544,4 @@ function setup(input) {
 
 exports.handleWebSocketConnect = handleWebSocketConnect; exports.handleRawWebSocketHandler = handleRawWebSocketHandler; exports.RegistryConfigSchema = RegistryConfigSchema; exports.createActorRouter = createActorRouter; exports.actor = actor; exports.InlineWebSocketAdapter2 = InlineWebSocketAdapter2; exports.createEngineDriver = createEngineDriver; exports.createFileSystemOrMemoryDriver = createFileSystemOrMemoryDriver; exports.createFileSystemDriver = createFileSystemDriver; exports.createMemoryDriver = createMemoryDriver; exports.createManagerRouter = createManagerRouter; exports.Registry = Registry; exports.setup = setup;
 //! These configs configs hold anything that's not platform-specific about running actors.
-//# sourceMappingURL=chunk-2S7HJMMY.cjs.map
+//# sourceMappingURL=chunk-M5BHNJHB.cjs.map