rivetkit 2.3.12-rc.1 → 2.3.12-rc.3

package/dist/tsup/{chunk-6ETWXXAZ.cjs → chunk-PZBWSCQR.cjs}

@@ -8,7 +8,7 @@ var _chunkKVFIONKQcjs = require('./chunk-KVFIONKQ.cjs');
 
 
 
-var _chunkVJ4KLJO5cjs = require('./chunk-VJ4KLJO5.cjs');
+var _chunkEQKSWDIHcjs = require('./chunk-EQKSWDIH.cjs');
 
 
 
@@ -35,13 +35,13 @@ var _chunkVJ4KLJO5cjs = require('./chunk-VJ4KLJO5.cjs');
 
 
 
-var _chunkT4MKKCRFcjs = require('./chunk-T4MKKCRF.cjs');
+var _chunk4ESGNS3Zcjs = require('./chunk-4ESGNS3Z.cjs');
 
 
 
 
 
-var _chunk4FC7TVS6cjs = require('./chunk-4FC7TVS6.cjs');
+var _chunkSPJORZMMcjs = require('./chunk-SPJORZMM.cjs');
 
 // src/common/actor-router-consts.ts
 var PATH_CONNECT = "/connect";
@@ -108,16 +108,16 @@ var ActorConnDisposed = class extends ActorClientError {
 function isSchedulingError(group, code) {
   return group === "guard" && (code === "actor_ready_timeout" || code === "actor_runner_failed");
 }
-function actorSchedulingError(group, code, actorId, details) {
-  return new (0, _chunk4FC7TVS6cjs.RivetError)(
+function actorSchedulingError(group, code, actorId, details, rayId) {
+  return new (0, _chunkSPJORZMMcjs.RivetError)(
     group,
     code,
     `Actor failed to start (${actorId}): ${JSON.stringify(details)}`,
-    { metadata: { actorId, details } }
+    { metadata: { actorId, details }, rayId }
   );
 }
 function internalClientError(message, opts) {
-  return new (0, _chunk4FC7TVS6cjs.RivetError)("rivetkit", _chunk4FC7TVS6cjs.INTERNAL_ERROR_CODE, message, {
+  return new (0, _chunkSPJORZMMcjs.RivetError)("rivetkit", _chunkSPJORZMMcjs.INTERNAL_ERROR_CODE, message, {
     cause: opts == null ? void 0 : opts.cause
   });
 }
@@ -2102,7 +2102,7 @@ function getActorNameFromQuery(query) {
   if ("getForKey" in query) return query.getForKey.name;
   if ("getOrCreateForKey" in query) return query.getOrCreateForKey.name;
   if ("create" in query) return query.create.name;
-  throw _chunk4FC7TVS6cjs.invalidRequest.call(void 0, "Invalid query format");
+  throw _chunkSPJORZMMcjs.invalidRequest.call(void 0, "Invalid query format");
 }
 function isDynamicActorQuery(actorQuery) {
   return "getForKey" in actorQuery || "getOrCreateForKey" in actorQuery;
@@ -2112,7 +2112,7 @@ function getGatewayTarget(state) {
     return { directId: state.getForId.actorId };
   }
   if ("create" in state) {
-    throw _chunk4FC7TVS6cjs.invalidRequest.call(void 0, 
+    throw _chunkSPJORZMMcjs.invalidRequest.call(void 0, 
       "create queries cannot be used as gateway targets. Resolve to an actor ID first."
     );
   }
@@ -2121,23 +2121,29 @@ function getGatewayTarget(state) {
 function isStaleResolvedActorError(group, code) {
   return group === "actor" && (code === "not_found" || code === "starting" || code === "stopping" || code === "not_configured" || code === "dropped_reply" || code.startsWith("destroyed_"));
 }
-async function checkForSchedulingError(group, code, actorId, query, driver) {
+async function checkForSchedulingError(group, code, actorId, query, driver, rayId) {
   const name = getActorNameFromQuery(query);
   try {
     const actor = await driver.getForId({ name, actorId });
     if (actor == null ? void 0 : actor.error) {
-      _chunkVJ4KLJO5cjs.logger.call(void 0, ).info({
+      _chunkEQKSWDIHcjs.logger.call(void 0, ).info({
         msg: "found actor scheduling error",
         actorId,
         error: actor.error
       });
-      return actorSchedulingError(group, code, actorId, actor.error);
+      return actorSchedulingError(
+        group,
+        code,
+        actorId,
+        actor.error,
+        rayId
+      );
     }
   } catch (err) {
-    _chunkVJ4KLJO5cjs.logger.call(void 0, ).warn({
+    _chunkEQKSWDIHcjs.logger.call(void 0, ).warn({
       msg: "failed to fetch actor details for scheduling error check",
       actorId,
-      error: _chunkT4MKKCRFcjs.stringifyError.call(void 0, err)
+      error: _chunk4ESGNS3Zcjs.stringifyError.call(void 0, err)
     });
   }
   return null;
@@ -2270,7 +2276,7 @@ function classifyTransportError(error) {
 }
 function classifyLifecycleBoundaryError(error) {
   for (const current of walkErrorChain(error)) {
-    if (current instanceof _chunk4FC7TVS6cjs.RivetError) {
+    if (current instanceof _chunkSPJORZMMcjs.RivetError) {
       const classified = classifyActorError(current);
       if (classified) {
         return classified;
@@ -2347,7 +2353,7 @@ function parseWebSocketCloseReason(reason) {
   const [mainPart, rayId] = reason.split("#");
   const [group, code] = mainPart.split(".");
   if (!group || !code) {
-    _chunkVJ4KLJO5cjs.logger.call(void 0, ).warn({ msg: "failed to parse close reason", reason });
+    _chunkEQKSWDIHcjs.logger.call(void 0, ).warn({ msg: "failed to parse close reason", reason });
     return void 0;
   }
   return {
@@ -2369,11 +2375,11 @@ function messageLength(message) {
   if (typeof message === "string") {
     return message.length;
   }
-  _chunkT4MKKCRFcjs.assertUnreachable.call(void 0, message);
+  _chunk4ESGNS3Zcjs.assertUnreachable.call(void 0, message);
 }
 async function sendHttpRequest(opts) {
   var _a, _b, _c;
-  _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+  _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
     msg: "sending http request",
     url: opts.url,
     encoding: opts.encoding
@@ -2382,8 +2388,8 @@ async function sendHttpRequest(opts) {
   let bodyData;
   if (opts.method === "POST" || opts.method === "PUT") {
     _invariant2.default.call(void 0, opts.body !== void 0, "missing body");
-    contentType = _chunkT4MKKCRFcjs.contentTypeForEncoding.call(void 0, opts.encoding);
-    bodyData = _chunkT4MKKCRFcjs.serializeWithEncoding.call(void 0, 
+    contentType = _chunk4ESGNS3Zcjs.contentTypeForEncoding.call(void 0, opts.encoding);
+    bodyData = _chunk4ESGNS3Zcjs.serializeWithEncoding.call(void 0, 
       opts.encoding,
       opts.body,
       opts.requestVersionedDataHandler,
@@ -2403,7 +2409,7 @@ async function sendHttpRequest(opts) {
           ...contentType ? {
             "Content-Type": contentType
           } : {},
-          "User-Agent": _chunkT4MKKCRFcjs.httpUserAgent.call(void 0, )
+          "User-Agent": _chunk4ESGNS3Zcjs.httpUserAgent.call(void 0, )
         },
         body: bodyData,
         credentials: "include",
@@ -2421,7 +2427,7 @@ async function sendHttpRequest(opts) {
     const rayId = response.headers.get("x-rivet-ray-id");
     const encoding = (contentType2 == null ? void 0 : contentType2.includes("application/json")) ? "json" : opts.encoding;
     try {
-      const responseData = _chunkT4MKKCRFcjs.deserializeWithEncoding.call(void 0, 
+      const responseData = _chunk4ESGNS3Zcjs.deserializeWithEncoding.call(void 0, 
         encoding,
         new Uint8Array(bufferResponse),
         HTTP_RESPONSE_ERROR_VERSIONED,
@@ -2439,7 +2445,7 @@ async function sendHttpRequest(opts) {
           group: bare5.group,
           code: bare5.code,
           message: bare5.message,
-          metadata: bare5.metadata ? _chunkT4MKKCRFcjs.decodeCborCompat.call(void 0, new Uint8Array(bare5.metadata)) : void 0,
+          metadata: bare5.metadata ? _chunk4ESGNS3Zcjs.decodeCborCompat.call(void 0, new Uint8Array(bare5.metadata)) : void 0,
           actor: bare5.actor ? {
             actorId: bare5.actor.actorId,
             generation: Number(bare5.actor.generation),
@@ -2447,27 +2453,29 @@ async function sendHttpRequest(opts) {
           } : void 0
         })
       );
-      _chunkVJ4KLJO5cjs.logger.call(void 0, ).warn({
+      _chunkEQKSWDIHcjs.logger.call(void 0, ).warn({
         msg: "http error response",
         group: responseData.group,
         code: responseData.code,
         message: responseData.message,
         metadata: responseData.metadata,
+        rayId,
         actorId: (_a = responseData.actor) == null ? void 0 : _a.actorId,
         generation: (_b = responseData.actor) == null ? void 0 : _b.generation,
         actorKey: (_c = responseData.actor) == null ? void 0 : _c.key
       });
-      throw new (0, _chunk4FC7TVS6cjs.RivetError)(
+      throw new (0, _chunkSPJORZMMcjs.RivetError)(
         responseData.group,
         responseData.code,
         responseData.message,
         {
           metadata: responseData.metadata,
+          rayId: _nullishCoalesce(rayId, () => ( void 0)),
           actor: responseData.actor
         }
       );
     } catch (error) {
-      if (error instanceof _chunk4FC7TVS6cjs.RivetError) {
+      if (error instanceof _chunkSPJORZMMcjs.RivetError) {
         throw error;
       }
       const textResponse = new TextDecoder("utf-8", {
@@ -2491,7 +2499,7 @@ ${textResponse}`
   }
   try {
     const buffer = new Uint8Array(await response.arrayBuffer());
-    return _chunkT4MKKCRFcjs.deserializeWithEncoding.call(void 0, 
+    return _chunk4ESGNS3Zcjs.deserializeWithEncoding.call(void 0, 
       opts.encoding,
       buffer,
       opts.responseVersionedDataHandler,
@@ -2538,8 +2546,8 @@ function createQueueSender(senderOptions) {
       }),
       requestToBare: (value) => ({
         name: _nullishCoalesce(value.name, () => ( name)),
-        body: _chunkT4MKKCRFcjs.bufferToArrayBuffer.call(void 0, 
-          _chunkT4MKKCRFcjs.encodeCborCompat.call(void 0, value.body)
+        body: _chunk4ESGNS3Zcjs.bufferToArrayBuffer.call(void 0, 
+          _chunk4ESGNS3Zcjs.encodeCborCompat.call(void 0, value.body)
         ),
         wait: _nullishCoalesce(value.wait, () => ( false)),
         timeout: value.timeout !== void 0 ? BigInt(value.timeout) : null
@@ -2559,7 +2567,7 @@ function createQueueSender(senderOptions) {
         }
         return {
           status: bare5.status,
-          response: _chunkT4MKKCRFcjs.decodeCborCompat.call(void 0, new Uint8Array(bare5.response))
+          response: _chunk4ESGNS3Zcjs.decodeCborCompat.call(void 0, new Uint8Array(bare5.response))
         };
       }
     });
@@ -2627,7 +2635,7 @@ async function rawHttpFetch(driver, target, params, input, init, options = {}) {
     throw new TypeError("Invalid input type for fetch");
   }
   try {
-    _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug(
+    _chunkEQKSWDIHcjs.logger.call(void 0, ).debug(
       "directId" in target ? {
         msg: "sending raw http request to actor",
         actorId: target.directId
@@ -2648,11 +2656,8 @@ async function rawHttpFetch(driver, target, params, input, init, options = {}) {
     });
     return driver.sendRequest(target, proxyRequest, options);
   } catch (err) {
-    const { group, code, message, metadata, actor } = _chunkT4MKKCRFcjs.deconstructError.call(void 0, 
-      err,
-      true
-    );
-    throw new (0, _chunk4FC7TVS6cjs.RivetError)(group, code, message, { metadata, actor });
+    const { group, code, message, metadata, rayId, actor } = _chunk4ESGNS3Zcjs.deconstructError.call(void 0, err, true);
+    throw new (0, _chunkSPJORZMMcjs.RivetError)(group, code, message, { metadata, rayId, actor });
   }
 }
 async function rawWebSocket(driver, target, params, path, _protocols, options = {}) {
@@ -2672,7 +2677,7 @@ async function rawWebSocket(driver, target, params, path, _protocols, options =
     }
   }
   const fullPath = `${PATH_WEBSOCKET_PREFIX}${pathPortion}${queryPortion}`;
-  _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+  _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
     msg: "opening websocket",
     target,
     encoding,
@@ -2702,7 +2707,7 @@ async function resolveGatewayTarget(driver, target) {
       key: target.getForKey.key
     });
     if (!output) {
-      throw _chunk4FC7TVS6cjs.actorNotFound.call(void 0, 
+      throw _chunkSPJORZMMcjs.actorNotFound.call(void 0, 
         `${target.getForKey.name}:${JSON.stringify(target.getForKey.key)}`
       );
     }
@@ -2728,7 +2733,7 @@ async function resolveGatewayTarget(driver, target) {
     });
     return output.actorId;
   }
-  throw _chunk4FC7TVS6cjs.invalidRequest.call(void 0, "Invalid query format");
+  throw _chunkSPJORZMMcjs.invalidRequest.call(void 0, "Invalid query format");
 }
 
 // src/client/actor-handle.ts
@@ -2771,7 +2776,7 @@ var ActorHandleRaw = class {
   async #sendQueueMessage(name, body, options) {
     return await this.#queueSendMutex.run(async () => {
       const maxAttempts = this.#getDynamicQueryMaxAttempts();
-      let useQueryTarget = false;
+      let useQueryTarget = isDynamicActorQuery(this.#actorResolutionState);
       for (let attempt = 0; attempt < maxAttempts; attempt++) {
         let actorId;
         try {
@@ -2795,7 +2800,7 @@ var ActorHandleRaw = class {
             }
           }).send(name, body, options);
         } catch (err) {
-          const { group, code, message, metadata, actor } = _chunkT4MKKCRFcjs.deconstructError.call(void 0, err, true);
+          const { group, code, message, metadata, rayId, actor } = _chunk4ESGNS3Zcjs.deconstructError.call(void 0, err, true);
           if (this.#shouldRetryQueueDispatchOverload(
             group,
             code,
@@ -2811,7 +2816,8 @@ var ActorHandleRaw = class {
             code,
             actorId,
             attempt,
-            maxAttempts
+            maxAttempts,
+            rayId
           )) {
             useQueryTarget = true;
             await this.#waitForRetryWindow();
@@ -2833,14 +2839,16 @@ var ActorHandleRaw = class {
             code
           );
           if (invalidated && attempt < maxAttempts - 1) {
-            useQueryTarget = code === "starting" || code === "stopping" || code.startsWith("destroyed_");
-            if (useQueryTarget) {
+            const waitForReady = code === "starting" || code === "stopping" || code.startsWith("destroyed_");
+            useQueryTarget = useQueryTarget || waitForReady;
+            if (waitForReady) {
               await this.#waitForRetryWindow();
             }
             continue;
           }
-          throw new (0, _chunk4FC7TVS6cjs.RivetError)(group, code, message, {
+          throw new (0, _chunkSPJORZMMcjs.RivetError)(group, code, message, {
             metadata,
+            rayId,
             actor
           });
         }
@@ -2869,7 +2877,7 @@ var ActorHandleRaw = class {
   }
   async #sendActionNow(opts) {
     const maxAttempts = this.#getDynamicQueryMaxAttempts();
-    let useQueryTarget = false;
+    let useQueryTarget = isDynamicActorQuery(this.#actorResolutionState);
     const gatewayOptions = resolveActorGatewayOptions(
       this.#gatewayOptions,
       opts
@@ -2882,13 +2890,13 @@ var ActorHandleRaw = class {
           gatewayOptions
         );
         actorId = "directId" in target ? target.directId : void 0;
-        _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug(
+        _chunkEQKSWDIHcjs.logger.call(void 0, ).debug(
           actorId ? { msg: "using direct actor gateway target", actorId } : {
             msg: "using query gateway target for action",
             query: this.#actorResolutionState
           }
         );
-        _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+        _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
           msg: "handling action",
           name: opts.name,
           encoding: this.#encoding
@@ -2922,25 +2930,26 @@ var ActorHandleRaw = class {
             args
           }),
           requestToBare: (args) => ({
-            args: _chunkT4MKKCRFcjs.bufferToArrayBuffer.call(void 0, 
-              _chunkT4MKKCRFcjs.encodeCborCompat.call(void 0, args)
+            args: _chunk4ESGNS3Zcjs.bufferToArrayBuffer.call(void 0, 
+              _chunk4ESGNS3Zcjs.encodeCborCompat.call(void 0, args)
             )
           }),
           responseFromJson: (json) => json.output,
-          responseFromBare: (bare5) => _chunkT4MKKCRFcjs.decodeCborCompat.call(void 0, new Uint8Array(bare5.output))
+          responseFromBare: (bare5) => _chunk4ESGNS3Zcjs.decodeCborCompat.call(void 0, new Uint8Array(bare5.output))
         });
         if (opts.name === "destroy" && actorId) {
           await this.#waitForDestroyActionToSettle(actorId);
         }
         return output;
       } catch (err) {
-        const { group, code, message, metadata, actor } = _chunkT4MKKCRFcjs.deconstructError.call(void 0, err, true);
+        const { group, code, message, metadata, rayId, actor } = _chunk4ESGNS3Zcjs.deconstructError.call(void 0, err, true);
         if (await this.#shouldRetrySchedulingError(
           group,
           code,
           actorId,
           attempt,
-          maxAttempts
+          maxAttempts,
+          rayId
         )) {
           useQueryTarget = true;
           await this.#waitForRetryWindow();
@@ -2958,11 +2967,11 @@ var ActorHandleRaw = class {
           continue;
         }
         if (group === "actor" && code === "destroyed_while_waiting_for_ready" && "getForId" in this.#actorResolutionState) {
-          throw new (0, _chunk4FC7TVS6cjs.RivetError)(
+          throw new (0, _chunkSPJORZMMcjs.RivetError)(
             "actor",
             "not_found",
             "The actor does not exist or was destroyed.",
-            { metadata, actor }
+            { metadata, rayId, actor }
           );
         }
         const invalidated = this.#invalidateResolvedActorId(
@@ -2978,7 +2987,11 @@ var ActorHandleRaw = class {
           }
           continue;
         }
-        throw new (0, _chunk4FC7TVS6cjs.RivetError)(group, code, message, { metadata, actor });
+        throw new (0, _chunkSPJORZMMcjs.RivetError)(group, code, message, {
+          metadata,
+          rayId,
+          actor
+        });
       }
     }
     throw new Error("unreachable action retry state");
@@ -3020,7 +3033,7 @@ var ActorHandleRaw = class {
     this.#resolvedActorId = void 0;
     this.#resolvingActorId = void 0;
   }
-  async #shouldRetrySchedulingError(group, code, actorId, attempt, maxAttempts) {
+  async #shouldRetrySchedulingError(group, code, actorId, attempt, maxAttempts, rayId) {
     if (!isDynamicActorQuery(this.#actorResolutionState) || !isSchedulingError(group, code) || attempt >= maxAttempts - 1) {
       return false;
     }
@@ -3030,7 +3043,8 @@ var ActorHandleRaw = class {
         code,
         actorId,
         this.#actorResolutionState,
-        this.#driver
+        this.#driver,
+        rayId
       );
       if (schedulingError) {
         throw schedulingError;
@@ -3084,7 +3098,7 @@ var ActorHandleRaw = class {
    * @returns {ActorConn<AD>} A connection to the actor.
    */
   connect(params, options = {}) {
-    _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+    _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
       msg: "establishing connection from handle",
       query: this.#actorResolutionState
     });
@@ -3112,7 +3126,7 @@ var ActorHandleRaw = class {
   }
   async #fetchWithResolvedActor(input, init) {
     const maxAttempts = this.#getDynamicQueryMaxAttempts();
-    let useQueryTarget = false;
+    let useQueryTarget = isDynamicActorQuery(this.#actorResolutionState);
     const { skipReadyWait, ...requestInit } = _nullishCoalesce(init, () => ( {}));
     const gatewayOptions = resolveActorGatewayOptions(
       this.#gatewayOptions,
@@ -3151,13 +3165,14 @@ var ActorHandleRaw = class {
         }
         return response;
       } catch (err) {
-        const { group, code, message, metadata, actor } = _chunkT4MKKCRFcjs.deconstructError.call(void 0, err, true);
+        const { group, code, message, metadata, rayId, actor } = _chunk4ESGNS3Zcjs.deconstructError.call(void 0, err, true);
         if (await this.#shouldRetrySchedulingError(
           group,
           code,
           actorId,
           attempt,
-          maxAttempts
+          maxAttempts,
+          rayId
         )) {
           useQueryTarget = true;
           await this.#waitForRetryWindow();
@@ -3179,13 +3194,18 @@ var ActorHandleRaw = class {
           code
         );
         if (invalidated && attempt < maxAttempts - 1) {
-          useQueryTarget = code === "starting" || code === "stopping" || code.startsWith("destroyed_");
-          if (useQueryTarget) {
+          const waitForReady = code === "starting" || code === "stopping" || code.startsWith("destroyed_");
+          useQueryTarget = useQueryTarget || waitForReady;
+          if (waitForReady) {
             await this.#waitForRetryWindow();
           }
           continue;
         }
-        throw new (0, _chunk4FC7TVS6cjs.RivetError)(group, code, message, { metadata, actor });
+        throw new (0, _chunkSPJORZMMcjs.RivetError)(group, code, message, {
+          metadata,
+          rayId,
+          actor
+        });
       }
     }
     throw new Error("unreachable fetch retry state");
@@ -3198,13 +3218,14 @@ var ActorHandleRaw = class {
     if (!error) {
       return null;
     }
-    const { group, code } = error;
+    const { group, code, rayId } = error;
     if (await this.#shouldRetrySchedulingError(
       group,
       code,
       actorId,
       attempt,
-      maxAttempts
+      maxAttempts,
+      rayId
     )) {
       return {
         useQueryTarget: true,
@@ -3225,10 +3246,10 @@ var ActorHandleRaw = class {
     }
     const invalidated = this.#invalidateResolvedActorId(group, code);
     if (invalidated && attempt < maxAttempts - 1) {
-      const useQueryTarget = code === "starting" || code === "stopping" || code.startsWith("destroyed_");
+      const waitForReady = code === "starting" || code === "stopping" || code.startsWith("destroyed_");
       return {
-        useQueryTarget,
-        waitForRetryWindow: useQueryTarget
+        useQueryTarget: true,
+        waitForRetryWindow: waitForReady
       };
     }
     return null;
@@ -3240,7 +3261,7 @@ var ActorHandleRaw = class {
     const contentType = response.headers.get("content-type");
     const encoding = (contentType == null ? void 0 : contentType.includes("application/json")) ? "json" : this.#encoding;
     try {
-      return _chunkT4MKKCRFcjs.deserializeWithEncoding.call(void 0, 
+      const error = _chunk4ESGNS3Zcjs.deserializeWithEncoding.call(void 0, 
         encoding,
         new Uint8Array(await response.clone().arrayBuffer()),
         HTTP_RESPONSE_ERROR_VERSIONED,
@@ -3256,7 +3277,7 @@ var ActorHandleRaw = class {
           group: bare5.group,
           code: bare5.code,
           message: bare5.message,
-          metadata: bare5.metadata ? _chunkT4MKKCRFcjs.decodeCborCompat.call(void 0, new Uint8Array(bare5.metadata)) : void 0,
+          metadata: bare5.metadata ? _chunk4ESGNS3Zcjs.decodeCborCompat.call(void 0, new Uint8Array(bare5.metadata)) : void 0,
           actor: bare5.actor ? {
             actorId: bare5.actor.actorId,
             generation: Number(bare5.actor.generation),
@@ -3264,6 +3285,10 @@ var ActorHandleRaw = class {
           } : void 0
         })
       );
+      return {
+        ...error,
+        rayId: _nullishCoalesce(response.headers.get("x-rivet-ray-id"), () => ( void 0))
+      };
     } catch (e) {
       return null;
     }
@@ -3323,11 +3348,13 @@ var ActorHandleRaw = class {
     const response = await this.#driver.sendRequest(target, request);
     if (!response.ok) {
       const body = await response.text().catch(() => "");
-      throw new (0, _chunk4FC7TVS6cjs.RivetError)(
+      throw new (0, _chunkSPJORZMMcjs.RivetError)(
         "actor",
         "reload_failed",
         `reload failed with status ${response.status}: ${body}`,
-        {}
+        {
+          rayId: _nullishCoalesce(response.headers.get("x-rivet-ray-id"), () => ( void 0))
+        }
       );
     }
   }
@@ -3360,7 +3387,7 @@ var ClientRaw = (_class = class {
    * @returns {ActorHandle<AD>} - A handle to the actor.
    */
   getForId(name, actorId, opts) {
-    _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+    _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
       msg: "get handle to actor with id",
       name,
       actorId,
@@ -3390,7 +3417,7 @@ var ClientRaw = (_class = class {
    */
   get(name, key, opts) {
     const keyArray = typeof key === "string" ? [key] : key || [];
-    _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+    _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
       msg: "get handle to actor",
       name,
       key: keyArray,
@@ -3420,7 +3447,7 @@ var ClientRaw = (_class = class {
    */
   getOrCreate(name, key, opts) {
     const keyArray = typeof key === "string" ? [key] : key || [];
-    _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+    _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
       msg: "get or create handle to actor",
       name,
       key: keyArray,
@@ -3463,7 +3490,7 @@ var ClientRaw = (_class = class {
         key: keyArray
       }
     };
-    _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+    _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
       msg: "create actor handle",
       name,
       key: keyArray,
@@ -3471,7 +3498,7 @@ var ClientRaw = (_class = class {
       create: createQuery.create
     });
     const actorId = await resolveGatewayTarget(this.#driver, createQuery);
-    _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+    _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
       msg: "created actor with ID",
       name,
       key: keyArray,
@@ -3514,11 +3541,11 @@ var ClientRaw = (_class = class {
    */
   async dispose() {
     if (this.#disposed) {
-      _chunkVJ4KLJO5cjs.logger.call(void 0, ).warn({ msg: "client already disconnected" });
+      _chunkEQKSWDIHcjs.logger.call(void 0, ).warn({ msg: "client already disconnected" });
       return;
     }
     this.#disposed = true;
-    _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({ msg: "disposing client" });
+    _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({ msg: "disposing client" });
     const disposePromises = [];
     for (const conn of this[ACTOR_CONNS_SYMBOL].values()) {
       disposePromises.push(conn.dispose());
@@ -3685,8 +3712,8 @@ var ActorConnRaw = class {
     if ("getForId" in actorResolutionState) {
       this.#actorId = actorResolutionState.getForId.actorId;
     }
-    this.#readyPromise = _chunkT4MKKCRFcjs.promiseWithResolvers.call(void 0, 
-      (reason) => _chunkVJ4KLJO5cjs.logger.call(void 0, ).warn({
+    this.#readyPromise = _chunk4ESGNS3Zcjs.promiseWithResolvers.call(void 0, 
+      (reason) => _chunkEQKSWDIHcjs.logger.call(void 0, ).warn({
         msg: "unhandled ready promise rejection",
         reason
       })
@@ -3749,11 +3776,11 @@ var ActorConnRaw = class {
         `Invalid action call: expected an options object { name, args }, got ${typeof opts}. Use conn.actionName(...args) for the shorthand API.`
       );
     }
-    _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({ msg: "action", name: opts.name, args: opts.args });
+    _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({ msg: "action", name: opts.name, args: opts.args });
     const actionId = this.#actionIdCounter;
     this.#actionIdCounter += 1;
-    const { promise, resolve, reject } = _chunkT4MKKCRFcjs.promiseWithResolvers.call(void 0, 
-      (reason) => _chunkVJ4KLJO5cjs.logger.call(void 0, ).warn({
+    const { promise, resolve, reject } = _chunk4ESGNS3Zcjs.promiseWithResolvers.call(void 0, 
+      (reason) => _chunkEQKSWDIHcjs.logger.call(void 0, ).warn({
         msg: "unhandled action promise rejection",
         reason
       })
@@ -3763,7 +3790,7 @@ var ActorConnRaw = class {
       resolve,
       reject
     });
-    _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+    _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
       msg: "added action to in-flight map",
       actionId,
       actionName: opts.name,
@@ -3803,9 +3830,9 @@ var ActorConnRaw = class {
       try {
         handler(status);
       } catch (err) {
-        _chunkVJ4KLJO5cjs.logger.call(void 0, ).error({
+        _chunkEQKSWDIHcjs.logger.call(void 0, ).error({
           msg: "error in status change handler",
-          error: _chunkT4MKKCRFcjs.stringifyError.call(void 0, err)
+          error: _chunk4ESGNS3Zcjs.stringifyError.call(void 0, err)
         });
       }
     }
@@ -3815,9 +3842,9 @@ var ActorConnRaw = class {
         try {
           handler();
         } catch (err) {
-          _chunkVJ4KLJO5cjs.logger.call(void 0, ).error({
+          _chunkEQKSWDIHcjs.logger.call(void 0, ).error({
             msg: "error in open handler",
-            error: _chunkT4MKKCRFcjs.stringifyError.call(void 0, err)
+            error: _chunk4ESGNS3Zcjs.stringifyError.call(void 0, err)
           });
         }
       }
@@ -3827,9 +3854,9 @@ var ActorConnRaw = class {
         try {
           handler();
         } catch (err) {
-          _chunkVJ4KLJO5cjs.logger.call(void 0, ).error({
+          _chunkEQKSWDIHcjs.logger.call(void 0, ).error({
             msg: "error in close handler",
-            error: _chunkT4MKKCRFcjs.stringifyError.call(void 0, err)
+            error: _chunk4ESGNS3Zcjs.stringifyError.call(void 0, err)
           });
         }
       }
@@ -3842,21 +3869,21 @@ var ActorConnRaw = class {
       minTimeout: 250,
       maxTimeout: 3e4,
       onFailedAttempt: (error) => {
-        _chunkVJ4KLJO5cjs.logger.call(void 0, ).warn({
+        _chunkEQKSWDIHcjs.logger.call(void 0, ).warn({
           msg: "failed to reconnect",
           attempt: error.attemptNumber,
-          error: _chunkT4MKKCRFcjs.stringifyError.call(void 0, error)
+          error: _chunk4ESGNS3Zcjs.stringifyError.call(void 0, error)
         });
       },
       // Cancel retry if aborted
       signal: this.#abortController.signal
     }).catch((err) => {
       if (err instanceof _pretry.AbortError || err.name === "AbortError" || !this.#shouldRetryConnectionOpenError(err)) {
-        _chunkVJ4KLJO5cjs.logger.call(void 0, ).info({ msg: "connection retry aborted" });
+        _chunkEQKSWDIHcjs.logger.call(void 0, ).info({ msg: "connection retry aborted" });
       } else {
-        _chunkVJ4KLJO5cjs.logger.call(void 0, ).error({
+        _chunkEQKSWDIHcjs.logger.call(void 0, ).error({
           msg: "unexpected error in connection retry",
-          error: _chunkT4MKKCRFcjs.stringifyError.call(void 0, err)
+          error: _chunk4ESGNS3Zcjs.stringifyError.call(void 0, err)
         });
       }
     });
@@ -3865,8 +3892,8 @@ var ActorConnRaw = class {
     try {
       if (this.#onOpenPromise)
         throw new Error("#onOpenPromise already defined");
-      this.#onOpenPromise = _chunkT4MKKCRFcjs.promiseWithResolvers.call(void 0, 
-        (reason) => _chunkVJ4KLJO5cjs.logger.call(void 0, ).warn({
+      this.#onOpenPromise = _chunk4ESGNS3Zcjs.promiseWithResolvers.call(void 0, 
+        (reason) => _chunkEQKSWDIHcjs.logger.call(void 0, ).warn({
           msg: "unhandled open promise rejection",
           reason
         })
@@ -3877,18 +3904,18 @@ var ActorConnRaw = class {
       if (this.#shouldRetryConnectionOpenError(error)) {
         throw error;
       }
-      const actorError = error instanceof _chunk4FC7TVS6cjs.RivetError ? error : new (0, _chunk4FC7TVS6cjs.RivetError)(
+      const actorError = error instanceof _chunkSPJORZMMcjs.RivetError ? error : new (0, _chunkSPJORZMMcjs.RivetError)(
         "client",
         "connection_open_failed",
-        `Failed to open connection: ${_chunkT4MKKCRFcjs.stringifyError.call(void 0, error)}`,
-        { error: _chunkT4MKKCRFcjs.stringifyError.call(void 0, error) }
+        `Failed to open connection: ${_chunk4ESGNS3Zcjs.stringifyError.call(void 0, error)}`,
+        { error: _chunk4ESGNS3Zcjs.stringifyError.call(void 0, error) }
       );
       this.#clearQueuedMessages();
       this.#rejectPendingPromises(actorError, false);
       this.#dispatchActorError(actorError);
       this.#setConnStatus("idle");
       throw new (0, _pretry.AbortError)(
-        error instanceof Error ? error : new Error(_chunkT4MKKCRFcjs.stringifyError.call(void 0, error))
+        error instanceof Error ? error : new Error(_chunk4ESGNS3Zcjs.stringifyError.call(void 0, error))
       );
     } finally {
       this.#onOpenPromise = void 0;
@@ -3898,17 +3925,17 @@ var ActorConnRaw = class {
     if (error instanceof ActorConnDisposed) {
       return false;
     }
-    if (error instanceof _chunk4FC7TVS6cjs.RivetError && this.#shouldReconnectForStaleActor(error.group, error.code)) {
+    if (error instanceof _chunkSPJORZMMcjs.RivetError && this.#shouldReconnectForStaleActor(error.group, error.code)) {
       return true;
     }
-    if (error instanceof _chunk4FC7TVS6cjs.RivetError && error.group === "client" && error.code === "get_params_failed") {
+    if (error instanceof _chunkSPJORZMMcjs.RivetError && error.group === "client" && error.code === "get_params_failed") {
       return true;
     }
     return isRetryableLifecycleReconnectSignal(error);
   }
   #clearQueuedMessages() {
     if (this.#messageQueue.length === 0) return;
-    _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+    _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
       msg: "clearing queued connection messages",
       queueLength: this.#messageQueue.length
     });
@@ -3921,8 +3948,8 @@ var ActorConnRaw = class {
     try {
       return await this.#getParams();
     } catch (err) {
-      const errorMessage = _chunkT4MKKCRFcjs.stringifyError.call(void 0, err);
-      const error = new (0, _chunk4FC7TVS6cjs.RivetError)(
+      const errorMessage = _chunk4ESGNS3Zcjs.stringifyError.call(void 0, err);
+      const error = new (0, _chunkSPJORZMMcjs.RivetError)(
         "client",
         "get_params_failed",
         `Failed to resolve connection params: ${errorMessage}`,
@@ -3945,7 +3972,7 @@ var ActorConnRaw = class {
       this.#gatewayOptions
     );
     _invariant2.default.call(void 0, ws, "websocket should have been created");
-    _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+    _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
       msg: "opened websocket",
       connId: this.#connId,
       readyState: ws.readyState,
@@ -3953,7 +3980,7 @@ var ActorConnRaw = class {
     });
     this.#websocket = ws;
     ws.addEventListener("open", () => {
-      _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+      _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
         msg: "client websocket open",
         connId: this.#connId
       });
@@ -3962,9 +3989,9 @@ var ActorConnRaw = class {
       try {
         await this.#handleOnMessage(ev.data);
       } catch (err) {
-        _chunkVJ4KLJO5cjs.logger.call(void 0, ).error({
+        _chunkEQKSWDIHcjs.logger.call(void 0, ).error({
           msg: "error in websocket message handler",
-          error: _chunkT4MKKCRFcjs.stringifyError.call(void 0, err)
+          error: _chunk4ESGNS3Zcjs.stringifyError.call(void 0, err)
         });
       }
     });
@@ -3972,9 +3999,9 @@ var ActorConnRaw = class {
       try {
         await this.#handleOnClose(ev);
       } catch (err) {
-        _chunkVJ4KLJO5cjs.logger.call(void 0, ).error({
+        _chunkEQKSWDIHcjs.logger.call(void 0, ).error({
           msg: "error in websocket close handler",
-          error: _chunkT4MKKCRFcjs.stringifyError.call(void 0, err)
+          error: _chunk4ESGNS3Zcjs.stringifyError.call(void 0, err)
         });
       }
     });
@@ -3982,9 +4009,9 @@ var ActorConnRaw = class {
       try {
         this.#handleOnError();
       } catch (err) {
-        _chunkVJ4KLJO5cjs.logger.call(void 0, ).error({
+        _chunkEQKSWDIHcjs.logger.call(void 0, ).error({
           msg: "error in websocket error handler",
-          error: _chunkT4MKKCRFcjs.stringifyError.call(void 0, err)
+          error: _chunk4ESGNS3Zcjs.stringifyError.call(void 0, err)
         });
       }
     });
@@ -3992,7 +4019,7 @@ var ActorConnRaw = class {
   /** Called by the onopen event from drivers. */
   #handleOnOpen() {
     if (this.#disposed) {
-      _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+      _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
         msg: "handleOnOpen called after dispose, closing websocket"
       });
       if (this.#websocket) {
@@ -4008,7 +4035,7 @@ var ActorConnRaw = class {
     queueMicrotask(() => {
       this.#openScheduled = false;
       if (this.#disposed) {
-        _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+        _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
           msg: "handleOnOpen scheduled after dispose, closing websocket"
         });
         if (this.#websocket) {
@@ -4017,7 +4044,7 @@ var ActorConnRaw = class {
         }
         return;
       }
-      _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+      _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
         msg: "socket open",
         messageQueueLength: this.#messageQueue.length,
         connId: this.#connId
@@ -4026,14 +4053,14 @@ var ActorConnRaw = class {
       if (this.#onOpenPromise) {
         this.#onOpenPromise.resolve(void 0);
       } else {
-        _chunkVJ4KLJO5cjs.logger.call(void 0, ).warn({ msg: "#onOpenPromise is undefined" });
+        _chunkEQKSWDIHcjs.logger.call(void 0, ).warn({ msg: "#onOpenPromise is undefined" });
       }
       for (const eventName of this.#eventSubscriptions.keys()) {
         this.#sendSubscription(eventName, true);
       }
       const queue = this.#messageQueue;
       this.#messageQueue = [];
-      _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+      _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
         msg: "flushing message queue",
         queueLength: queue.length
       });
@@ -4045,23 +4072,23 @@ var ActorConnRaw = class {
   /** Called by the onmessage event from drivers. */
   async #handleOnMessage(data) {
     var _a;
-    _chunkVJ4KLJO5cjs.logger.call(void 0, ).trace({
+    _chunkEQKSWDIHcjs.logger.call(void 0, ).trace({
       msg: "received message",
       dataType: typeof data,
       isBlob: data instanceof Blob,
       isArrayBuffer: data instanceof ArrayBuffer
     });
     const response = await this.#parseMessage(data);
-    _chunkVJ4KLJO5cjs.logger.call(void 0, ).trace(
-      _chunkT4MKKCRFcjs.getLogMessage.call(void 0, ) ? {
+    _chunkEQKSWDIHcjs.logger.call(void 0, ).trace(
+      _chunk4ESGNS3Zcjs.getLogMessage.call(void 0, ) ? {
         msg: "parsed message",
-        message: _chunkT4MKKCRFcjs.jsonStringifyCompat.call(void 0, response).substring(0, 100) + "..."
+        message: _chunk4ESGNS3Zcjs.jsonStringifyCompat.call(void 0, response).substring(0, 100) + "..."
       } : { msg: "parsed message" }
     );
     if (response.body.tag === "Init") {
       this.#actorId = response.body.val.actorId;
       this.#connId = response.body.val.connectionId;
-      _chunkVJ4KLJO5cjs.logger.call(void 0, ).trace({
+      _chunkEQKSWDIHcjs.logger.call(void 0, ).trace({
         msg: "received init message",
         actorId: this.#actorId,
         connId: this.#connId
@@ -4072,7 +4099,7 @@ var ActorConnRaw = class {
       if (actionId !== null) {
         const inFlight = this.#takeActionInFlight(Number(actionId));
         this.#invalidateActorIfStale(group, code);
-        _chunkVJ4KLJO5cjs.logger.call(void 0, ).warn({
+        _chunkEQKSWDIHcjs.logger.call(void 0, ).warn({
           msg: "action error",
           actionId,
           actionName: inFlight == null ? void 0 : inFlight.name,
@@ -4085,13 +4112,13 @@ var ActorConnRaw = class {
           actorKey: actor == null ? void 0 : actor.key
         });
         inFlight.reject(
-          new (0, _chunk4FC7TVS6cjs.RivetError)(group, code, message, {
+          new (0, _chunkSPJORZMMcjs.RivetError)(group, code, message, {
             metadata,
             actor
           })
         );
       } else {
-        _chunkVJ4KLJO5cjs.logger.call(void 0, ).warn({
+        _chunkEQKSWDIHcjs.logger.call(void 0, ).warn({
           msg: "connection error",
           group,
           code,
@@ -4104,14 +4131,14 @@ var ActorConnRaw = class {
         if (this.#shouldReconnectForStaleActor(group, code)) {
           this.#clearResolvedActorIdentity();
           (_a = this.#onOpenPromise) == null ? void 0 : _a.reject(
-            new (0, _chunk4FC7TVS6cjs.RivetError)(group, code, message, {
+            new (0, _chunkSPJORZMMcjs.RivetError)(group, code, message, {
               metadata,
               actor
             })
           );
           return;
         }
-        let errorToThrow = new (0, _chunk4FC7TVS6cjs.RivetError)(group, code, message, {
+        let errorToThrow = new (0, _chunkSPJORZMMcjs.RivetError)(group, code, message, {
           metadata,
           actor
         });
@@ -4139,27 +4166,27 @@ var ActorConnRaw = class {
       }
     } else if (response.body.tag === "ActionResponse") {
       const { id: actionId } = response.body.val;
-      _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+      _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
         msg: "received action response",
         actionId: Number(actionId),
         inFlightCount: this.#actionsInFlight.size,
         inFlightIds: Array.from(this.#actionsInFlight.keys())
       });
       const inFlight = this.#takeActionInFlight(Number(actionId));
-      _chunkVJ4KLJO5cjs.logger.call(void 0, ).trace({
+      _chunkEQKSWDIHcjs.logger.call(void 0, ).trace({
         msg: "resolving action promise",
         actionId,
         actionName: inFlight == null ? void 0 : inFlight.name
       });
       inFlight.resolve(response.body.val);
     } else if (response.body.tag === "Event") {
-      _chunkVJ4KLJO5cjs.logger.call(void 0, ).trace({
+      _chunkEQKSWDIHcjs.logger.call(void 0, ).trace({
         msg: "received event",
         name: response.body.val.name
       });
       this.#dispatchEvent(response.body.val);
     } else {
-      _chunkT4MKKCRFcjs.assertUnreachable.call(void 0, response.body);
+      _chunk4ESGNS3Zcjs.assertUnreachable.call(void 0, response.body);
     }
   }
   /** Called by the onclose event from drivers. */
@@ -4168,7 +4195,7 @@ var ActorConnRaw = class {
     const closeEvent = event;
     const wasClean = closeEvent.wasClean;
     const wasConnected = this.#connStatus === "connected";
-    _chunkVJ4KLJO5cjs.logger.call(void 0, ).info({
+    _chunkEQKSWDIHcjs.logger.call(void 0, ).info({
       msg: "socket closed",
       code: closeEvent.code,
       reason: closeEvent.reason,
@@ -4185,15 +4212,15 @@ var ActorConnRaw = class {
       const reason = closeEvent.reason || "";
       const parsed = parseWebSocketCloseReason(reason);
       if (parsed) {
-        const { group, code } = parsed;
+        const { group, code, rayId } = parsed;
         if (this.#shouldReconnectForStaleActor(group, code)) {
           this.#clearResolvedActorIdentity();
           (_a = this.#onOpenPromise) == null ? void 0 : _a.reject(
-            new (0, _chunk4FC7TVS6cjs.RivetError)(
+            new (0, _chunkSPJORZMMcjs.RivetError)(
               group,
               code,
               `Connection closed: ${reason}`,
-              void 0
+              { rayId }
             )
           );
           return;
@@ -4204,24 +4231,25 @@ var ActorConnRaw = class {
             code,
             this.#actorId,
             this.#actorResolutionState,
-            this.#driver
+            this.#driver,
+            rayId
           );
           if (schedulingError) {
             error = schedulingError;
           } else {
-            error = new (0, _chunk4FC7TVS6cjs.RivetError)(
+            error = new (0, _chunkSPJORZMMcjs.RivetError)(
               group,
               code,
               `Connection closed: ${reason}`,
-              void 0
+              { rayId }
             );
           }
         } else {
-          error = new (0, _chunk4FC7TVS6cjs.RivetError)(
+          error = new (0, _chunkSPJORZMMcjs.RivetError)(
             group,
             code,
             `Connection closed: ${reason}`,
-            void 0
+            { rayId }
           );
         }
         this.#invalidateActorIfStale(group, code);
@@ -4231,11 +4259,11 @@ var ActorConnRaw = class {
         );
       }
       this.#rejectPendingPromises(error, false);
-      if (error instanceof _chunk4FC7TVS6cjs.RivetError) {
+      if (error instanceof _chunkSPJORZMMcjs.RivetError) {
         this.#dispatchActorError(error);
       }
       if (wasConnected) {
-        _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+        _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
           msg: "triggering reconnect",
           connId: this.#connId
         });
@@ -4259,12 +4287,12 @@ var ActorConnRaw = class {
   /** Called by the onerror event from drivers. */
   #handleOnError() {
     if (this.#disposed) return;
-    _chunkVJ4KLJO5cjs.logger.call(void 0, ).warn("socket error");
+    _chunkEQKSWDIHcjs.logger.call(void 0, ).warn("socket error");
   }
   #takeActionInFlight(id) {
     const inFlight = this.#actionsInFlight.get(id);
     if (!inFlight) {
-      _chunkVJ4KLJO5cjs.logger.call(void 0, ).error({
+      _chunkEQKSWDIHcjs.logger.call(void 0, ).error({
         msg: "action not found in in-flight map",
         lookupId: id,
         inFlightCount: this.#actionsInFlight.size,
@@ -4279,7 +4307,7 @@ var ActorConnRaw = class {
       throw internalClientError(`No in flight response for ${id}`);
     }
     this.#actionsInFlight.delete(id);
-    _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+    _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
       msg: "removed action from in-flight map",
       actionId: id,
       actionName: inFlight.name,
@@ -4306,9 +4334,9 @@ var ActorConnRaw = class {
       try {
         handler(error);
       } catch (err) {
-        _chunkVJ4KLJO5cjs.logger.call(void 0, ).error({
+        _chunkEQKSWDIHcjs.logger.call(void 0, ).error({
           msg: "error in connection error handler",
-          error: _chunkT4MKKCRFcjs.stringifyError.call(void 0, err)
+          error: _chunk4ESGNS3Zcjs.stringifyError.call(void 0, err)
         });
       }
     }
@@ -4413,9 +4441,9 @@ var ActorConnRaw = class {
         try {
           callback();
         } catch (err) {
-          _chunkVJ4KLJO5cjs.logger.call(void 0, ).error({
+          _chunkEQKSWDIHcjs.logger.call(void 0, ).error({
             msg: "error in open handler",
-            error: _chunkT4MKKCRFcjs.stringifyError.call(void 0, err)
+            error: _chunk4ESGNS3Zcjs.stringifyError.call(void 0, err)
           });
         }
       });
@@ -4465,7 +4493,7 @@ var ActorConnRaw = class {
     let queueMessage = false;
     if (this.#websocket) {
       const readyState = this.#websocket.readyState;
-      _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+      _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
         msg: "websocket send attempt",
         readyState,
         readyStateString: readyState === 0 ? "CONNECTING" : readyState === 1 ? "OPEN" : readyState === 2 ? "CLOSING" : "CLOSED",
@@ -4474,7 +4502,7 @@ var ActorConnRaw = class {
         actionName: (_a = message.body.val) == null ? void 0 : _a.name
       });
       if (this.#connStatus !== "connected") {
-        _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+        _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
           msg: "websocket init pending, queueing message",
           connStatus: this.#connStatus,
           messageType: message.body.tag
@@ -4482,7 +4510,7 @@ var ActorConnRaw = class {
         queueMessage = true;
       } else if (readyState === 1) {
         try {
-          const messageSerialized = _chunkT4MKKCRFcjs.serializeWithEncoding.call(void 0, 
+          const messageSerialized = _chunk4ESGNS3Zcjs.serializeWithEncoding.call(void 0, 
             this.#encoding,
             message,
             CLIENT_PROTOCOL_TO_SERVER,
@@ -4499,8 +4527,8 @@ var ActorConnRaw = class {
                     val: {
                       id: msg.body.val.id,
                       name: msg.body.val.name,
-                      args: _chunkT4MKKCRFcjs.bufferToArrayBuffer.call(void 0, 
-                        _chunkT4MKKCRFcjs.encodeCborCompat.call(void 0, 
+                      args: _chunk4ESGNS3Zcjs.bufferToArrayBuffer.call(void 0, 
+                        _chunk4ESGNS3Zcjs.encodeCborCompat.call(void 0, 
                           msg.body.val.args
                         )
                       )
@@ -4514,12 +4542,12 @@ var ActorConnRaw = class {
           );
           this.#websocket.send(messageSerialized);
           const serializedLength = messageLength(messageSerialized);
-          _chunkVJ4KLJO5cjs.logger.call(void 0, ).trace({
+          _chunkEQKSWDIHcjs.logger.call(void 0, ).trace({
             msg: "sent websocket message",
             len: serializedLength
           });
         } catch (error) {
-          _chunkVJ4KLJO5cjs.logger.call(void 0, ).warn({
+          _chunkEQKSWDIHcjs.logger.call(void 0, ).warn({
             msg: "failed to send message, added to queue",
             error,
             connId: this.#connId
@@ -4527,19 +4555,19 @@ var ActorConnRaw = class {
           queueMessage = true;
         }
       } else {
-        _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+        _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
           msg: "websocket not open, queueing message",
           readyState
         });
         queueMessage = true;
       }
     } else {
-      _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({ msg: "no websocket, queueing message" });
+      _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({ msg: "no websocket, queueing message" });
       queueMessage = true;
     }
     if (!(opts == null ? void 0 : opts.ephemeral) && queueMessage) {
       this.#messageQueue.push(message);
-      _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({
+      _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({
         msg: "queued connection message",
         queueLength: this.#messageQueue.length,
         connId: this.#connId,
@@ -4550,8 +4578,8 @@ var ActorConnRaw = class {
   }
   async #parseMessage(data) {
     _invariant2.default.call(void 0, this.#websocket, "websocket must be defined");
-    const buffer = await _chunkT4MKKCRFcjs.inputDataToBuffer.call(void 0, data);
-    return _chunkT4MKKCRFcjs.deserializeWithEncoding.call(void 0, 
+    const buffer = await _chunk4ESGNS3Zcjs.inputDataToBuffer.call(void 0, data);
+    return _chunk4ESGNS3Zcjs.deserializeWithEncoding.call(void 0, 
       this.#encoding,
       buffer,
       CLIENT_PROTOCOL_TO_CLIENT,
@@ -4586,7 +4614,7 @@ var ActorConnRaw = class {
                 group: msg.body.val.group,
                 code: msg.body.val.code,
                 message: msg.body.val.message,
-                metadata: msg.body.val.metadata ? _chunkT4MKKCRFcjs.decodeCborCompat.call(void 0, 
+                metadata: msg.body.val.metadata ? _chunk4ESGNS3Zcjs.decodeCborCompat.call(void 0, 
                   new Uint8Array(
                     msg.body.val.metadata
                   )
@@ -4608,7 +4636,7 @@ var ActorConnRaw = class {
               tag: "ActionResponse",
               val: {
                 id: msg.body.val.id,
-                output: _chunkT4MKKCRFcjs.decodeCborCompat.call(void 0, 
+                output: _chunk4ESGNS3Zcjs.decodeCborCompat.call(void 0, 
                   new Uint8Array(msg.body.val.output)
                 )
               }
@@ -4620,7 +4648,7 @@ var ActorConnRaw = class {
               tag: "Event",
               val: {
                 name: msg.body.val.name,
-                args: _chunkT4MKKCRFcjs.decodeCborCompat.call(void 0, 
+                args: _chunk4ESGNS3Zcjs.decodeCborCompat.call(void 0, 
                   new Uint8Array(msg.body.val.args)
                 )
               }
@@ -4661,11 +4689,11 @@ var ActorConnRaw = class {
    */
   async dispose() {
     if (this.#disposed) {
-      _chunkVJ4KLJO5cjs.logger.call(void 0, ).warn({ msg: "connection already disconnected" });
+      _chunkEQKSWDIHcjs.logger.call(void 0, ).warn({ msg: "connection already disconnected" });
       return;
     }
     this.#disposed = true;
-    _chunkVJ4KLJO5cjs.logger.call(void 0, ).debug({ msg: "disposing actor conn" });
+    _chunkEQKSWDIHcjs.logger.call(void 0, ).debug({ msg: "disposing actor conn" });
     this.#setConnStatus("idle");
     clearInterval(this.#keepNodeAliveInterval);
     this.#abortController.abort();
@@ -4673,8 +4701,8 @@ var ActorConnRaw = class {
     if (this.#websocket) {
       const ws = this.#websocket;
       if (ws.readyState !== 2 && ws.readyState !== 3) {
-        const { promise, resolve } = _chunkT4MKKCRFcjs.promiseWithResolvers.call(void 0, 
-          (reason) => _chunkVJ4KLJO5cjs.logger.call(void 0, ).warn({
+        const { promise, resolve } = _chunk4ESGNS3Zcjs.promiseWithResolvers.call(void 0, 
+          (reason) => _chunkEQKSWDIHcjs.logger.call(void 0, ).warn({
             msg: "unhandled websocket close promise rejection",
             reason
           })
@@ -4793,7 +4821,7 @@ var ClientConfigSchemaBase = _v42.default.object({
    * Defaults to http://localhost:6420.
    */
   endpoint: _v42.default.string().optional().transform((val) => {
-    const resolved = _nullishCoalesce(_nullishCoalesce(val, () => ( _chunkT4MKKCRFcjs.getRivetEngine.call(void 0, ))), () => ( _chunkT4MKKCRFcjs.getRivetEndpoint.call(void 0, )));
+    const resolved = _nullishCoalesce(_nullishCoalesce(val, () => ( _chunk4ESGNS3Zcjs.getRivetEngine.call(void 0, ))), () => ( _chunk4ESGNS3Zcjs.getRivetEndpoint.call(void 0, )));
     if (!resolved && !hasWarnedMissingEndpoint) {
       hasWarnedMissingEndpoint = true;
       console.warn(
@@ -4803,12 +4831,12 @@ var ClientConfigSchemaBase = _v42.default.object({
     return _nullishCoalesce(resolved, () => ( DEFAULT_ENDPOINT));
   }),
   /** Token to use to authenticate with the API. */
-  token: _v42.default.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkT4MKKCRFcjs.getRivetToken.call(void 0, )))),
+  token: _v42.default.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunk4ESGNS3Zcjs.getRivetToken.call(void 0, )))),
   /** Namespace to connect to. */
-  namespace: _v42.default.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkT4MKKCRFcjs.getRivetNamespace.call(void 0, )))),
+  namespace: _v42.default.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunk4ESGNS3Zcjs.getRivetNamespace.call(void 0, )))),
   /** Name of the envoy pool. This is used to group together envoys in to different pools. */
-  poolName: _v42.default.string().default(() => _nullishCoalesce(_chunkT4MKKCRFcjs.getRivetPool.call(void 0, ), () => ( "default"))),
-  encoding: _chunkT4MKKCRFcjs.EncodingSchema.default("bare"),
+  poolName: _v42.default.string().default(() => _nullishCoalesce(_chunk4ESGNS3Zcjs.getRivetPool.call(void 0, ), () => ( "default"))),
+  encoding: _chunk4ESGNS3Zcjs.EncodingSchema.default("bare"),
   headers: _v42.default.record(_v42.default.string(), _v42.default.string()).optional().default(() => ({})),
   gateway: _v42.default.object({
     skipReadyWait: _v42.default.boolean().optional().default(false)
@@ -4967,7 +4995,7 @@ function setRemoteHibernatableWebSocketAckTestHooks(websocket, token, enabled) {
 
 // src/engine-client/log.ts
 function logger2() {
-  return _chunkT4MKKCRFcjs.getLogger.call(void 0, "engine-client");
+  return _chunk4ESGNS3Zcjs.getLogger.call(void 0, "engine-client");
 }
 
 // src/engine-client/actor-websocket-client.ts
@@ -5100,7 +5128,7 @@ var BufferedRemoteWebSocket = (_class2 = class {
 function buildActorGatewayUrl(endpoint, actorId, token, path = "") {
   const tokenSegment = token !== void 0 ? `@${encodeURIComponent(token)}` : "";
   const gatewayPath = `/gateway/${encodeURIComponent(actorId)}${tokenSegment}${path}`;
-  return _chunkT4MKKCRFcjs.combineUrlPath.call(void 0, endpoint, gatewayPath);
+  return _chunk4ESGNS3Zcjs.combineUrlPath.call(void 0, endpoint, gatewayPath);
 }
 function buildActorQueryGatewayUrl(endpoint, namespace, query, token, path = "", maxInputSize = DEFAULT_MAX_QUERY_INPUT_SIZE, crashPolicy = void 0, runnerName, options = {}) {
   if (namespace.length === 0) {
@@ -5166,7 +5194,7 @@ function buildActorQueryGatewayUrl(endpoint, namespace, query, token, path = "",
     separator = "?";
   }
   const gatewayPath = `/gateway/${encodeURIComponent(name)}${path}${separator}${queryString}`;
-  return _chunkT4MKKCRFcjs.combineUrlPath.call(void 0, endpoint, gatewayPath);
+  return _chunk4ESGNS3Zcjs.combineUrlPath.call(void 0, endpoint, gatewayPath);
 }
 function pushKeyQueryParams(params, key) {
   if (key.length > 0) {
@@ -5177,7 +5205,7 @@ function pushInputQueryParam(params, input, maxInputSize) {
   if (input === void 0) {
     return;
   }
-  const encodedInput = _chunkT4MKKCRFcjs.encodeCborCompat.call(void 0, input);
+  const encodedInput = _chunk4ESGNS3Zcjs.encodeCborCompat.call(void 0, input);
   if (encodedInput.byteLength > maxInputSize) {
     throw new Error(
       `Actor query input exceeds maxInputSize (${encodedInput.byteLength} > ${maxInputSize} bytes). Increase client maxInputSize to allow larger query payloads.`
@@ -5186,10 +5214,10 @@ function pushInputQueryParam(params, input, maxInputSize) {
   params.append("rvt-input", uint8ArrayToBase64Url(encodedInput));
 }
 function uint8ArrayToBase64Url(value) {
-  return _chunkT4MKKCRFcjs.uint8ArrayToBase64.call(void 0, value).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/g, "");
+  return _chunk4ESGNS3Zcjs.uint8ArrayToBase64.call(void 0, value).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/g, "");
 }
 async function openWebSocketToGateway(runConfig, gatewayUrl, encoding, params, options = {}) {
-  const WebSocket2 = await _chunkVJ4KLJO5cjs.importWebSocket.call(void 0, );
+  const WebSocket2 = await _chunkEQKSWDIHcjs.importWebSocket.call(void 0, );
   const ackHookToken = typeof process !== "undefined" && process.env.VITEST ? crypto.randomUUID() : void 0;
   logger2().debug({
     msg: "opening websocket to actor via guard",
@@ -5256,7 +5284,7 @@ function getEndpoint(config) {
 }
 async function apiCall(config, method, path, body) {
   const endpoint = getEndpoint(config);
-  const url = _chunkT4MKKCRFcjs.combineUrlPath.call(void 0, endpoint, path, {
+  const url = _chunk4ESGNS3Zcjs.combineUrlPath.call(void 0, endpoint, path, {
     namespace: config.namespace
   });
   logger2().debug({ msg: "making api call", method, url });
@@ -5381,7 +5409,7 @@ async function lookupMetadataCached(config) {
             msg: "failed to fetch metadata, retrying",
             endpoint,
             attempt: error.attemptNumber,
-            error: _chunkT4MKKCRFcjs.stringifyError.call(void 0, error)
+            error: _chunk4ESGNS3Zcjs.stringifyError.call(void 0, error)
           });
         }
       }
@@ -5393,7 +5421,7 @@ async function lookupMetadataCached(config) {
 
 // src/engine-client/ws-proxy.ts
 async function createWebSocketProxy(_c, targetUrl, protocols) {
-  const WebSocket2 = await _chunkVJ4KLJO5cjs.importWebSocket.call(void 0, );
+  const WebSocket2 = await _chunkEQKSWDIHcjs.importWebSocket.call(void 0, );
   const state = {};
   return {
     onOpen: async (_event, clientWs) => {
@@ -5458,7 +5486,7 @@ async function createWebSocketProxy(_c, targetUrl, protocols) {
         logger2().error({
           msg: "target websocket error",
           targetUrl,
-          error: _chunkT4MKKCRFcjs.stringifyError.call(void 0, error)
+          error: _chunk4ESGNS3Zcjs.stringifyError.call(void 0, error)
         });
         closeWebSocketIfOpen(clientWs, 1011, "Target WebSocket error");
       });
@@ -5537,7 +5565,7 @@ var RemoteEngineControlClient = class {
   #config;
   #metadataPromise;
   constructor(runConfig) {
-    if (_chunkT4MKKCRFcjs.getNextPhase.call(void 0, ) === "phase-production-build") {
+    if (_chunk4ESGNS3Zcjs.getNextPhase.call(void 0, ) === "phase-production-build") {
       logger2().info(
         "detected next.js build phase, disabling health check"
       );
@@ -5609,7 +5637,7 @@ var RemoteEngineControlClient = class {
       });
       return apiActorToOutput(actor);
     } catch (error) {
-      if (error instanceof _chunk4FC7TVS6cjs.RivetError && error.group === "actor" && error.code === "not_found") {
+      if (error instanceof _chunkSPJORZMMcjs.RivetError && error.group === "actor" && error.code === "not_found") {
         return void 0;
       }
       throw error;
@@ -5630,24 +5658,45 @@ var RemoteEngineControlClient = class {
       name,
       key
     });
-    const { actor, created } = await getOrCreateActor(this.#config, {
-      datacenter: region,
-      name,
-      key: _chunkMYWZCDMLcjs.serializeActorKey.call(void 0, key),
-      runner_name_selector: _nullishCoalesce(poolName, () => ( this.#config.poolName)),
-      input: actorInput ? _chunkT4MKKCRFcjs.uint8ArrayToBase64.call(void 0, 
-        _chunkT4MKKCRFcjs.encodeCborCompat.call(void 0, actorInput)
-      ) : void 0,
-      crash_policy: _nullishCoalesce(crashPolicy, () => ( "sleep"))
-    });
-    logger2().info({
-      msg: "getOrCreateWithKey: actor ready",
-      actorId: actor.actor_id,
-      name,
-      key,
-      created
-    });
-    return apiActorToOutput(actor);
+    try {
+      const { actor, created } = await getOrCreateActor(this.#config, {
+        datacenter: region,
+        name,
+        key: _chunkMYWZCDMLcjs.serializeActorKey.call(void 0, key),
+        runner_name_selector: _nullishCoalesce(poolName, () => ( this.#config.poolName)),
+        input: actorInput ? _chunk4ESGNS3Zcjs.uint8ArrayToBase64.call(void 0, 
+          _chunk4ESGNS3Zcjs.encodeCborCompat.call(void 0, actorInput)
+        ) : void 0,
+        crash_policy: _nullishCoalesce(crashPolicy, () => ( "sleep"))
+      });
+      logger2().info({
+        msg: "getOrCreateWithKey: actor ready",
+        actorId: actor.actor_id,
+        name,
+        key,
+        created
+      });
+      return apiActorToOutput(actor);
+    } catch (error) {
+      if (error instanceof _chunkSPJORZMMcjs.RivetError && error.group === "actor" && error.code === "key_reserved_in_different_datacenter") {
+        logger2().warn({
+          msg: "getOrCreateWithKey: key reserved in different datacenter, retrying as get",
+          name,
+          key
+        });
+        const response = await getActorByKey(this.#config, name, key);
+        const existing = response.actors[0];
+        if (!existing) throw error;
+        logger2().info({
+          msg: "getOrCreateWithKey: resolved existing actor via get",
+          actorId: existing.actor_id,
+          name,
+          key
+        });
+        return apiActorToOutput(existing);
+      }
+      throw error;
+    }
   }
   async createActor({
     name,
@@ -5664,7 +5713,7 @@ var RemoteEngineControlClient = class {
       name,
       runner_name_selector: _nullishCoalesce(poolName, () => ( this.#config.poolName)),
       key: _chunkMYWZCDMLcjs.serializeActorKey.call(void 0, key),
-      input: input ? _chunkT4MKKCRFcjs.uint8ArrayToBase64.call(void 0, _chunkT4MKKCRFcjs.encodeCborCompat.call(void 0, input)) : void 0,
+      input: input ? _chunk4ESGNS3Zcjs.uint8ArrayToBase64.call(void 0, _chunk4ESGNS3Zcjs.encodeCborCompat.call(void 0, input)) : void 0,
       crash_policy: _nullishCoalesce(crashPolicy, () => ( "sleep"))
     });
     logger2().info({
@@ -5742,7 +5791,7 @@ var RemoteEngineControlClient = class {
     const upgradeWebSocket = (_b = (_a = this.#config).getUpgradeWebSocket) == null ? void 0 : _b.call(_a);
     _invariant2.default.call(void 0, upgradeWebSocket, "missing getUpgradeWebSocket");
     const endpoint = getEndpoint(this.#config);
-    const guardUrl = _chunkT4MKKCRFcjs.combineUrlPath.call(void 0, endpoint, path);
+    const guardUrl = _chunk4ESGNS3Zcjs.combineUrlPath.call(void 0, endpoint, path);
     const wsGuardUrl = guardUrl.replace("http://", "ws://");
     logger2().debug({
       msg: "forwarding websocket to actor via guard",
@@ -5761,7 +5810,7 @@ var RemoteEngineControlClient = class {
       }
     );
     const args = await createWebSocketProxy(c, wsGuardUrl, protocols);
-    return await upgradeWebSocket(() => args)(c, _chunkT4MKKCRFcjs.noopNext.call(void 0, ));
+    return await upgradeWebSocket(() => args)(c, _chunk4ESGNS3Zcjs.noopNext.call(void 0, ));
   }
   displayInformation() {
     return { properties: {} };
@@ -5772,7 +5821,7 @@ var RemoteEngineControlClient = class {
   #buildGatewayUrlForTarget(target, path, options = {}) {
     const endpoint = getEndpoint(this.#config);
     if (shouldSkipReadyWait(options) && directActorIdFromTarget(target) && canUseDirectSkipReadyWaitPath(path)) {
-      return _chunkT4MKKCRFcjs.combineUrlPath.call(void 0, endpoint, path);
+      return _chunk4ESGNS3Zcjs.combineUrlPath.call(void 0, endpoint, path);
     }
     if ("directId" in target) {
       return buildActorGatewayUrl(
@@ -5866,4 +5915,4 @@ function apiActorToOutput(actor) {
 
 
 exports.HEADER_CONN_PARAMS = HEADER_CONN_PARAMS; exports.ALLOWED_PUBLIC_HEADERS = ALLOWED_PUBLIC_HEADERS; exports.ActorClientError = ActorClientError; exports.ManagerError = ManagerError; exports.MalformedResponseMessage = MalformedResponseMessage; exports.ActorConnDisposed = ActorConnDisposed; exports.ActorConnRaw = ActorConnRaw; exports.isResponseLike = isResponseLike; exports.ActorHandleRaw = ActorHandleRaw; exports.createClientWithDriver = createClientWithDriver; exports.tryParseEndpoint = tryParseEndpoint; exports.ClientConfigSchema = ClientConfigSchema; exports.convertRegistryConfigToClientConfig = convertRegistryConfigToClientConfig; exports.getDatacenters = getDatacenters; exports.updateRunnerConfig = updateRunnerConfig; exports.RemoteEngineControlClient = RemoteEngineControlClient;
-//# sourceMappingURL=chunk-6ETWXXAZ.cjs.map
+//# sourceMappingURL=chunk-PZBWSCQR.cjs.map