@rivetkit/supabase 2.3.12-rc.1 → 2.3.12-rc.3

package/dist/mod.js

@@ -335,13 +335,13 @@ __export(mod_exports, {
 module.exports = __toCommonJS(mod_exports);
 var wasmBindings = __toESM(require("@rivetkit/rivetkit-wasm"));
 
-// ../rivetkit/dist/tsup/chunk-ZZ3WBRPD.js
+// ../rivetkit/dist/tsup/chunk-IXBD7BXC.js
 var INTERNAL_ERROR_CODE = "internal_error";
 var INTERNAL_ERROR_DESCRIPTION = "An internal error occurred";
 var USER_ERROR_CODE = "user_error";
 var BRIDGE_RIVET_ERROR_PREFIX = "__RIVET_ERROR_JSON__:";
 function looksLikeRivetErrorOptions(value) {
-  return typeof value === "object" && value !== null && ("public" in value || "metadata" in value || "statusCode" in value || "actor" in value || "cause" in value);
+  return typeof value === "object" && value !== null && ("public" in value || "metadata" in value || "rayId" in value || "statusCode" in value || "actor" in value || "cause" in value);
 }
 function isTypedErrorTag(value) {
   return value === "ActorError" || value === "RivetError";
@@ -353,7 +353,7 @@ function errorMessage(error46, fallback = String(error46)) {
   return fallback;
 }
 function isRivetErrorLike(error46) {
-  return typeof error46 === "object" && error46 !== null && "group" in error46 && typeof error46.group === "string" && "code" in error46 && typeof error46.code === "string" && "message" in error46 && typeof error46.message === "string" && (!("__type" in error46) || isTypedErrorTag(error46.__type));
+  return typeof error46 === "object" && error46 !== null && "group" in error46 && typeof error46.group === "string" && "code" in error46 && typeof error46.code === "string" && "message" in error46 && typeof error46.message === "string" && (!("rayId" in error46) || error46.rayId === void 0 || typeof error46.rayId === "string") && (!("__type" in error46) || isTypedErrorTag(error46.__type));
 }
 function isActorAbortedError(error46) {
   return isRivetErrorLike(error46) && error46.group === "actor" && error46.code === "aborted";
@@ -365,6 +365,7 @@ var RivetError = class extends Error {
   __type = "RivetError";
   public;
   metadata;
+  rayId;
   statusCode;
   actor;
   group;
@@ -383,6 +384,7 @@ var RivetError = class extends Error {
     this.code = code;
     this.public = normalized.public ?? false;
     this.metadata = normalized.metadata;
+    this.rayId = normalized.rayId ?? void 0;
     this.statusCode = normalized.statusCode ?? (this.public ? 400 : 500);
     this.actor = normalized.actor;
   }
@@ -417,6 +419,7 @@ function toRivetError(error46, fallback) {
       public: error46.public,
       statusCode: error46.statusCode,
       metadata: error46.metadata,
+      rayId: error46.rayId,
       actor: error46.actor,
       cause: error46 instanceof Error ? error46.cause : void 0
     });
@@ -429,6 +432,7 @@ function toRivetError(error46, fallback) {
       public: fallback == null ? void 0 : fallback.public,
       statusCode: fallback == null ? void 0 : fallback.statusCode,
       metadata: fallback == null ? void 0 : fallback.metadata,
+      rayId: fallback == null ? void 0 : fallback.rayId,
       actor: fallback == null ? void 0 : fallback.actor,
       cause: error46 instanceof Error ? error46 : void 0
     }
@@ -440,6 +444,7 @@ function encodeBridgeRivetError(error46) {
     code: error46.code,
     message: error46.message,
     metadata: error46.metadata,
+    rayId: error46.rayId,
     public: error46.public,
     statusCode: error46.statusCode,
     actor: error46.actor
@@ -450,9 +455,13 @@ function decodeBridgeRivetErrorPayload(value) {
     return void 0;
   }
   try {
-    const payload = JSON.parse(
+    const raw = JSON.parse(
       value.slice(BRIDGE_RIVET_ERROR_PREFIX.length)
     );
+    const payload = {
+      ...raw,
+      rayId: raw.rayId ?? void 0
+    };
     if (!isRivetErrorLike(payload)) {
       return void 0;
     }
@@ -471,6 +480,7 @@ function decodeBridgeRivetError(value) {
   }
   return new RivetError(payload.group, payload.code, payload.message, {
     metadata: payload.metadata,
+    rayId: payload.rayId,
     public: payload.public,
     statusCode: payload.statusCode,
     actor: payload.actor ?? void 0
@@ -509,7 +519,7 @@ function unsupportedFeature(feature) {
   );
 }
 
-// ../rivetkit/dist/tsup/chunk-HVHDZDM2.js
+// ../rivetkit/dist/tsup/chunk-OLGQYFUW.js
 var import_pino = require("pino");
 
 // ../../../node_modules/.pnpm/zod@4.1.13/node_modules/zod/v4/classic/external.js
@@ -13182,7 +13192,7 @@ var classic_default = external_exports;
 // ../../../node_modules/.pnpm/zod@4.1.13/node_modules/zod/v4/index.js
 var v4_default = classic_default;
 
-// ../rivetkit/dist/tsup/chunk-HVHDZDM2.js
+// ../rivetkit/dist/tsup/chunk-OLGQYFUW.js
 var cbor = __toESM(require("cbor-x"), 1);
 var import_invariant = __toESM(require_invariant(), 1);
 var getRivetEngine = () => getEnvUniversal("RIVET_ENGINE");
@@ -13251,6 +13261,7 @@ function deconstructError(error46, exposeInternalError = false) {
   let code;
   let message;
   let metadata;
+  let rayId;
   let actor2;
   if (isCanonicalStructuredRivetError(error46)) {
     statusCode = typeof error46.statusCode === "number" ? error46.statusCode : error46.public ? 400 : 500;
@@ -13259,6 +13270,7 @@ function deconstructError(error46, exposeInternalError = false) {
     code = error46.code;
     message = error46.message;
     metadata = error46.metadata;
+    rayId = error46.rayId;
     actor2 = error46.actor;
   } else if (RivetError.isActorError(error46) && error46.public) {
     statusCode = "statusCode" in error46 && error46.statusCode ? error46.statusCode : 400;
@@ -13267,6 +13279,7 @@ function deconstructError(error46, exposeInternalError = false) {
     code = error46.code;
     message = getErrorMessage(error46);
     metadata = error46.metadata;
+    rayId = error46.rayId;
     actor2 = error46.actor;
   } else if (exposeInternalError) {
     if (RivetError.isActorError(error46)) {
@@ -13276,6 +13289,7 @@ function deconstructError(error46, exposeInternalError = false) {
       code = error46.code;
       message = getErrorMessage(error46);
       metadata = error46.metadata;
+      rayId = error46.rayId;
       actor2 = error46.actor;
     } else {
       statusCode = 500;
@@ -13305,6 +13319,7 @@ function deconstructError(error46, exposeInternalError = false) {
     code,
     message,
     metadata,
+    rayId,
     actor: actor2
   };
 }
@@ -13347,7 +13362,7 @@ function noopNext() {
 }
 var package_default = {
   name: "rivetkit",
-  version: "2.3.12-rc.1",
+  version: "2.3.12-rc.3",
   description: "Lightweight libraries for building stateful actors on edge platforms",
   license: "Apache-2.0",
   keywords: [
@@ -14650,7 +14665,7 @@ function Config({ initialBufferLength = 1024, maxBufferLength = 1024 * 1024 * 32
   };
 }
 
-// ../rivetkit/dist/tsup/chunk-5UYNV4W6.js
+// ../rivetkit/dist/tsup/chunk-WVFTFWJL.js
 var config2 = /* @__PURE__ */ Config({});
 function readWorkflowCbor(bc) {
   return readData(bc);
@@ -15612,7 +15627,7 @@ var AsyncMutex = class {
   }
 };
 
-// ../rivetkit/dist/tsup/chunk-JHHAMABO.js
+// ../rivetkit/dist/tsup/chunk-XI4MEUUI.js
 function logger() {
   return getLogger("actor-client");
 }
@@ -15650,7 +15665,7 @@ async function importWebSocket() {
   return webSocketPromise;
 }
 
-// ../rivetkit/dist/tsup/chunk-A5BZEQOG.js
+// ../rivetkit/dist/tsup/chunk-YYIDQBBM.js
 var import_invariant2 = __toESM(require_invariant(), 1);
 
 // ../../../node_modules/.pnpm/p-retry@6.2.1/node_modules/p-retry/index.js
@@ -15828,7 +15843,7 @@ function createVersionedDataHandler(config3) {
   return new VersionedDataHandler(config3);
 }
 
-// ../rivetkit/dist/tsup/chunk-A5BZEQOG.js
+// ../rivetkit/dist/tsup/chunk-YYIDQBBM.js
 var import_invariant3 = __toESM(require_invariant(), 1);
 var import_invariant4 = __toESM(require_invariant(), 1);
 var PATH_CONNECT = "/connect";
@@ -15883,12 +15898,12 @@ 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) {
+function actorSchedulingError(group, code, actorId, details, rayId) {
   return new RivetError(
     group,
     code,
     `Actor failed to start (${actorId}): ${JSON.stringify(details)}`,
-    { metadata: { actorId, details } }
+    { metadata: { actorId, details }, rayId }
   );
 }
 function internalClientError(message, opts) {
@@ -17868,7 +17883,7 @@ 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 actor2 = await driver.getForId({ name, actorId });
@@ -17878,7 +17893,13 @@ async function checkForSchedulingError(group, code, actorId, query, driver) {
         actorId,
         error: actor2.error
       });
-      return actorSchedulingError(group, code, actorId, actor2.error);
+      return actorSchedulingError(
+        group,
+        code,
+        actorId,
+        actor2.error,
+        rayId
+      );
     }
   } catch (err) {
     logger().warn({
@@ -18195,6 +18216,7 @@ async function sendHttpRequest(opts) {
         code: responseData.code,
         message: responseData.message,
         metadata: responseData.metadata,
+        rayId,
         actorId: (_a2 = responseData.actor) == null ? void 0 : _a2.actorId,
         generation: (_b = responseData.actor) == null ? void 0 : _b.generation,
         actorKey: (_c = responseData.actor) == null ? void 0 : _c.key
@@ -18205,6 +18227,7 @@ async function sendHttpRequest(opts) {
         responseData.message,
         {
           metadata: responseData.metadata,
+          rayId: rayId ?? void 0,
           actor: responseData.actor
         }
       );
@@ -18384,11 +18407,8 @@ async function rawHttpFetch(driver, target, params, input, init, options = {}) {
     });
     return driver.sendRequest(target, proxyRequest, options);
   } catch (err) {
-    const { group, code, message, metadata, actor: actor2 } = deconstructError(
-      err,
-      true
-    );
-    throw new RivetError(group, code, message, { metadata, actor: actor2 });
+    const { group, code, message, metadata, rayId, actor: actor2 } = deconstructError(err, true);
+    throw new RivetError(group, code, message, { metadata, rayId, actor: actor2 });
   }
 }
 async function rawWebSocket(driver, target, params, path2, _protocols, options = {}) {
@@ -18503,7 +18523,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 {
@@ -18527,7 +18547,7 @@ var ActorHandleRaw = class {
             }
           }).send(name, body, options);
         } catch (err) {
-          const { group, code, message, metadata, actor: actor2 } = deconstructError(err, true);
+          const { group, code, message, metadata, rayId, actor: actor2 } = deconstructError(err, true);
           if (this.#shouldRetryQueueDispatchOverload(
             group,
             code,
@@ -18543,7 +18563,8 @@ var ActorHandleRaw = class {
             code,
             actorId,
             attempt,
-            maxAttempts
+            maxAttempts,
+            rayId
           )) {
             useQueryTarget = true;
             await this.#waitForRetryWindow();
@@ -18565,14 +18586,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 RivetError(group, code, message, {
             metadata,
+            rayId,
             actor: actor2
           });
         }
@@ -18601,7 +18624,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
@@ -18666,13 +18689,14 @@ var ActorHandleRaw = class {
         }
         return output;
       } catch (err) {
-        const { group, code, message, metadata, actor: actor2 } = deconstructError(err, true);
+        const { group, code, message, metadata, rayId, actor: actor2 } = deconstructError(err, true);
         if (await this.#shouldRetrySchedulingError(
           group,
           code,
           actorId,
           attempt,
-          maxAttempts
+          maxAttempts,
+          rayId
         )) {
           useQueryTarget = true;
           await this.#waitForRetryWindow();
@@ -18694,7 +18718,7 @@ var ActorHandleRaw = class {
             "actor",
             "not_found",
             "The actor does not exist or was destroyed.",
-            { metadata, actor: actor2 }
+            { metadata, rayId, actor: actor2 }
           );
         }
         const invalidated = this.#invalidateResolvedActorId(
@@ -18710,7 +18734,11 @@ var ActorHandleRaw = class {
           }
           continue;
         }
-        throw new RivetError(group, code, message, { metadata, actor: actor2 });
+        throw new RivetError(group, code, message, {
+          metadata,
+          rayId,
+          actor: actor2
+        });
       }
     }
     throw new Error("unreachable action retry state");
@@ -18752,7 +18780,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;
     }
@@ -18762,7 +18790,8 @@ var ActorHandleRaw = class {
         code,
         actorId,
         this.#actorResolutionState,
-        this.#driver
+        this.#driver,
+        rayId
       );
       if (schedulingError) {
         throw schedulingError;
@@ -18844,7 +18873,7 @@ var ActorHandleRaw = class {
   }
   async #fetchWithResolvedActor(input, init) {
     const maxAttempts = this.#getDynamicQueryMaxAttempts();
-    let useQueryTarget = false;
+    let useQueryTarget = isDynamicActorQuery(this.#actorResolutionState);
     const { skipReadyWait, ...requestInit } = init ?? {};
     const gatewayOptions = resolveActorGatewayOptions(
       this.#gatewayOptions,
@@ -18883,13 +18912,14 @@ var ActorHandleRaw = class {
         }
         return response;
       } catch (err) {
-        const { group, code, message, metadata, actor: actor2 } = deconstructError(err, true);
+        const { group, code, message, metadata, rayId, actor: actor2 } = deconstructError(err, true);
         if (await this.#shouldRetrySchedulingError(
           group,
           code,
           actorId,
           attempt,
-          maxAttempts
+          maxAttempts,
+          rayId
         )) {
           useQueryTarget = true;
           await this.#waitForRetryWindow();
@@ -18911,13 +18941,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 RivetError(group, code, message, { metadata, actor: actor2 });
+        throw new RivetError(group, code, message, {
+          metadata,
+          rayId,
+          actor: actor2
+        });
       }
     }
     throw new Error("unreachable fetch retry state");
@@ -18930,13 +18965,14 @@ var ActorHandleRaw = class {
     if (!error46) {
       return null;
     }
-    const { group, code } = error46;
+    const { group, code, rayId } = error46;
     if (await this.#shouldRetrySchedulingError(
       group,
       code,
       actorId,
       attempt,
-      maxAttempts
+      maxAttempts,
+      rayId
     )) {
       return {
         useQueryTarget: true,
@@ -18957,10 +18993,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;
@@ -18972,7 +19008,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 deserializeWithEncoding(
+      const error46 = deserializeWithEncoding(
         encoding,
         new Uint8Array(await response.clone().arrayBuffer()),
         HTTP_RESPONSE_ERROR_VERSIONED,
@@ -18996,6 +19032,10 @@ var ActorHandleRaw = class {
           } : void 0
         })
       );
+      return {
+        ...error46,
+        rayId: response.headers.get("x-rivet-ray-id") ?? void 0
+      };
     } catch {
       return null;
     }
@@ -19059,7 +19099,9 @@ var ActorHandleRaw = class {
         "actor",
         "reload_failed",
         `reload failed with status ${response.status}: ${body}`,
-        {}
+        {
+          rayId: response.headers.get("x-rivet-ray-id") ?? void 0
+        }
       );
     }
   }
@@ -19913,7 +19955,7 @@ 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();
           (_a2 = this.#onOpenPromise) == null ? void 0 : _a2.reject(
@@ -19921,7 +19963,7 @@ var ActorConnRaw = class {
               group,
               code,
               `Connection closed: ${reason}`,
-              void 0
+              { rayId }
             )
           );
           return;
@@ -19932,7 +19974,8 @@ var ActorConnRaw = class {
             code,
             this.#actorId,
             this.#actorResolutionState,
-            this.#driver
+            this.#driver,
+            rayId
           );
           if (schedulingError) {
             error46 = schedulingError;
@@ -19941,7 +19984,7 @@ var ActorConnRaw = class {
               group,
               code,
               `Connection closed: ${reason}`,
-              void 0
+              { rayId }
             );
           }
         } else {
@@ -19949,7 +19992,7 @@ var ActorConnRaw = class {
             group,
             code,
             `Connection closed: ${reason}`,
-            void 0
+            { rayId }
           );
         }
         this.#invalidateActorIfStale(group, code);
@@ -21326,24 +21369,45 @@ var RemoteEngineControlClient = class {
       name,
       key
     });
-    const { actor: actor2, created } = await getOrCreateActor(this.#config, {
-      datacenter: region,
-      name,
-      key: serializeActorKey(key),
-      runner_name_selector: poolName ?? this.#config.poolName,
-      input: actorInput ? uint8ArrayToBase642(
-        encodeCborCompat(actorInput)
-      ) : void 0,
-      crash_policy: crashPolicy ?? "sleep"
-    });
-    logger2().info({
-      msg: "getOrCreateWithKey: actor ready",
-      actorId: actor2.actor_id,
-      name,
-      key,
-      created
-    });
-    return apiActorToOutput(actor2);
+    try {
+      const { actor: actor2, created } = await getOrCreateActor(this.#config, {
+        datacenter: region,
+        name,
+        key: serializeActorKey(key),
+        runner_name_selector: poolName ?? this.#config.poolName,
+        input: actorInput ? uint8ArrayToBase642(
+          encodeCborCompat(actorInput)
+        ) : void 0,
+        crash_policy: crashPolicy ?? "sleep"
+      });
+      logger2().info({
+        msg: "getOrCreateWithKey: actor ready",
+        actorId: actor2.actor_id,
+        name,
+        key,
+        created
+      });
+      return apiActorToOutput(actor2);
+    } catch (error46) {
+      if (error46 instanceof RivetError && error46.group === "actor" && error46.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 error46;
+        logger2().info({
+          msg: "getOrCreateWithKey: resolved existing actor via get",
+          actorId: existing.actor_id,
+          name,
+          key
+        });
+        return apiActorToOutput(existing);
+      }
+      throw error46;
+    }
   }
   async createActor({
     name,
@@ -21544,7 +21608,7 @@ function apiActorToOutput(actor2) {
   };
 }
 
-// ../rivetkit/dist/tsup/chunk-KRPA4UOE.js
+// ../rivetkit/dist/tsup/chunk-PSXMESQJ.js
 var nativeStateTransactionOpeners = /* @__PURE__ */ new WeakMap();
 var nativeStateTransactionClientBinders = /* @__PURE__ */ new WeakMap();
 function registerNativeStateTransactionOpener(provider, opener) {
@@ -26441,7 +26505,8 @@ function encodeNativeCallbackError(error46) {
   return Object.assign(bridgeError, {
     group: structuredError.group,
     code: structuredError.code,
-    metadata: structuredError.metadata
+    metadata: structuredError.metadata,
+    rayId: structuredError.rayId
   });
 }
 async function callNative(invoke) {

package/dist/mod.mjs

@@ -297,13 +297,13 @@ var require_retry2 = __commonJS({
 // src/mod.ts
 import * as wasmBindings from "@rivetkit/rivetkit-wasm";
 
-// ../rivetkit/dist/tsup/chunk-ZZ3WBRPD.js
+// ../rivetkit/dist/tsup/chunk-IXBD7BXC.js
 var INTERNAL_ERROR_CODE = "internal_error";
 var INTERNAL_ERROR_DESCRIPTION = "An internal error occurred";
 var USER_ERROR_CODE = "user_error";
 var BRIDGE_RIVET_ERROR_PREFIX = "__RIVET_ERROR_JSON__:";
 function looksLikeRivetErrorOptions(value) {
-  return typeof value === "object" && value !== null && ("public" in value || "metadata" in value || "statusCode" in value || "actor" in value || "cause" in value);
+  return typeof value === "object" && value !== null && ("public" in value || "metadata" in value || "rayId" in value || "statusCode" in value || "actor" in value || "cause" in value);
 }
 function isTypedErrorTag(value) {
   return value === "ActorError" || value === "RivetError";
@@ -315,7 +315,7 @@ function errorMessage(error46, fallback = String(error46)) {
   return fallback;
 }
 function isRivetErrorLike(error46) {
-  return typeof error46 === "object" && error46 !== null && "group" in error46 && typeof error46.group === "string" && "code" in error46 && typeof error46.code === "string" && "message" in error46 && typeof error46.message === "string" && (!("__type" in error46) || isTypedErrorTag(error46.__type));
+  return typeof error46 === "object" && error46 !== null && "group" in error46 && typeof error46.group === "string" && "code" in error46 && typeof error46.code === "string" && "message" in error46 && typeof error46.message === "string" && (!("rayId" in error46) || error46.rayId === void 0 || typeof error46.rayId === "string") && (!("__type" in error46) || isTypedErrorTag(error46.__type));
 }
 function isActorAbortedError(error46) {
   return isRivetErrorLike(error46) && error46.group === "actor" && error46.code === "aborted";
@@ -327,6 +327,7 @@ var RivetError = class extends Error {
   __type = "RivetError";
   public;
   metadata;
+  rayId;
   statusCode;
   actor;
   group;
@@ -345,6 +346,7 @@ var RivetError = class extends Error {
     this.code = code;
     this.public = normalized.public ?? false;
     this.metadata = normalized.metadata;
+    this.rayId = normalized.rayId ?? void 0;
     this.statusCode = normalized.statusCode ?? (this.public ? 400 : 500);
     this.actor = normalized.actor;
   }
@@ -379,6 +381,7 @@ function toRivetError(error46, fallback) {
       public: error46.public,
       statusCode: error46.statusCode,
       metadata: error46.metadata,
+      rayId: error46.rayId,
       actor: error46.actor,
       cause: error46 instanceof Error ? error46.cause : void 0
     });
@@ -391,6 +394,7 @@ function toRivetError(error46, fallback) {
       public: fallback == null ? void 0 : fallback.public,
       statusCode: fallback == null ? void 0 : fallback.statusCode,
       metadata: fallback == null ? void 0 : fallback.metadata,
+      rayId: fallback == null ? void 0 : fallback.rayId,
       actor: fallback == null ? void 0 : fallback.actor,
       cause: error46 instanceof Error ? error46 : void 0
     }
@@ -402,6 +406,7 @@ function encodeBridgeRivetError(error46) {
     code: error46.code,
     message: error46.message,
     metadata: error46.metadata,
+    rayId: error46.rayId,
     public: error46.public,
     statusCode: error46.statusCode,
     actor: error46.actor
@@ -412,9 +417,13 @@ function decodeBridgeRivetErrorPayload(value) {
     return void 0;
   }
   try {
-    const payload = JSON.parse(
+    const raw = JSON.parse(
       value.slice(BRIDGE_RIVET_ERROR_PREFIX.length)
     );
+    const payload = {
+      ...raw,
+      rayId: raw.rayId ?? void 0
+    };
     if (!isRivetErrorLike(payload)) {
       return void 0;
     }
@@ -433,6 +442,7 @@ function decodeBridgeRivetError(value) {
   }
   return new RivetError(payload.group, payload.code, payload.message, {
     metadata: payload.metadata,
+    rayId: payload.rayId,
     public: payload.public,
     statusCode: payload.statusCode,
     actor: payload.actor ?? void 0
@@ -471,7 +481,7 @@ function unsupportedFeature(feature) {
   );
 }
 
-// ../rivetkit/dist/tsup/chunk-HVHDZDM2.js
+// ../rivetkit/dist/tsup/chunk-OLGQYFUW.js
 import {
   pino,
   stdTimeFunctions
@@ -13147,7 +13157,7 @@ var classic_default = external_exports;
 // ../../../node_modules/.pnpm/zod@4.1.13/node_modules/zod/v4/index.js
 var v4_default = classic_default;
 
-// ../rivetkit/dist/tsup/chunk-HVHDZDM2.js
+// ../rivetkit/dist/tsup/chunk-OLGQYFUW.js
 var import_invariant = __toESM(require_invariant(), 1);
 import * as cbor from "cbor-x";
 var getRivetEngine = () => getEnvUniversal("RIVET_ENGINE");
@@ -13216,6 +13226,7 @@ function deconstructError(error46, exposeInternalError = false) {
   let code;
   let message;
   let metadata;
+  let rayId;
   let actor2;
   if (isCanonicalStructuredRivetError(error46)) {
     statusCode = typeof error46.statusCode === "number" ? error46.statusCode : error46.public ? 400 : 500;
@@ -13224,6 +13235,7 @@ function deconstructError(error46, exposeInternalError = false) {
     code = error46.code;
     message = error46.message;
     metadata = error46.metadata;
+    rayId = error46.rayId;
     actor2 = error46.actor;
   } else if (RivetError.isActorError(error46) && error46.public) {
     statusCode = "statusCode" in error46 && error46.statusCode ? error46.statusCode : 400;
@@ -13232,6 +13244,7 @@ function deconstructError(error46, exposeInternalError = false) {
     code = error46.code;
     message = getErrorMessage(error46);
     metadata = error46.metadata;
+    rayId = error46.rayId;
     actor2 = error46.actor;
   } else if (exposeInternalError) {
     if (RivetError.isActorError(error46)) {
@@ -13241,6 +13254,7 @@ function deconstructError(error46, exposeInternalError = false) {
       code = error46.code;
       message = getErrorMessage(error46);
       metadata = error46.metadata;
+      rayId = error46.rayId;
       actor2 = error46.actor;
     } else {
       statusCode = 500;
@@ -13270,6 +13284,7 @@ function deconstructError(error46, exposeInternalError = false) {
     code,
     message,
     metadata,
+    rayId,
     actor: actor2
   };
 }
@@ -13312,7 +13327,7 @@ function noopNext() {
 }
 var package_default = {
   name: "rivetkit",
-  version: "2.3.12-rc.1",
+  version: "2.3.12-rc.3",
   description: "Lightweight libraries for building stateful actors on edge platforms",
   license: "Apache-2.0",
   keywords: [
@@ -14615,7 +14630,7 @@ function Config({ initialBufferLength = 1024, maxBufferLength = 1024 * 1024 * 32
   };
 }
 
-// ../rivetkit/dist/tsup/chunk-5UYNV4W6.js
+// ../rivetkit/dist/tsup/chunk-WVFTFWJL.js
 var config2 = /* @__PURE__ */ Config({});
 function readWorkflowCbor(bc) {
   return readData(bc);
@@ -15577,7 +15592,7 @@ var AsyncMutex = class {
   }
 };
 
-// ../rivetkit/dist/tsup/chunk-JHHAMABO.js
+// ../rivetkit/dist/tsup/chunk-XI4MEUUI.js
 function logger() {
   return getLogger("actor-client");
 }
@@ -15615,7 +15630,7 @@ async function importWebSocket() {
   return webSocketPromise;
 }
 
-// ../rivetkit/dist/tsup/chunk-A5BZEQOG.js
+// ../rivetkit/dist/tsup/chunk-YYIDQBBM.js
 var import_invariant2 = __toESM(require_invariant(), 1);
 
 // ../../../node_modules/.pnpm/p-retry@6.2.1/node_modules/p-retry/index.js
@@ -15793,7 +15808,7 @@ function createVersionedDataHandler(config3) {
   return new VersionedDataHandler(config3);
 }
 
-// ../rivetkit/dist/tsup/chunk-A5BZEQOG.js
+// ../rivetkit/dist/tsup/chunk-YYIDQBBM.js
 var import_invariant3 = __toESM(require_invariant(), 1);
 var import_invariant4 = __toESM(require_invariant(), 1);
 var PATH_CONNECT = "/connect";
@@ -15848,12 +15863,12 @@ 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) {
+function actorSchedulingError(group, code, actorId, details, rayId) {
   return new RivetError(
     group,
     code,
     `Actor failed to start (${actorId}): ${JSON.stringify(details)}`,
-    { metadata: { actorId, details } }
+    { metadata: { actorId, details }, rayId }
   );
 }
 function internalClientError(message, opts) {
@@ -17833,7 +17848,7 @@ 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 actor2 = await driver.getForId({ name, actorId });
@@ -17843,7 +17858,13 @@ async function checkForSchedulingError(group, code, actorId, query, driver) {
         actorId,
         error: actor2.error
       });
-      return actorSchedulingError(group, code, actorId, actor2.error);
+      return actorSchedulingError(
+        group,
+        code,
+        actorId,
+        actor2.error,
+        rayId
+      );
     }
   } catch (err) {
     logger().warn({
@@ -18160,6 +18181,7 @@ async function sendHttpRequest(opts) {
         code: responseData.code,
         message: responseData.message,
         metadata: responseData.metadata,
+        rayId,
         actorId: (_a2 = responseData.actor) == null ? void 0 : _a2.actorId,
         generation: (_b = responseData.actor) == null ? void 0 : _b.generation,
         actorKey: (_c = responseData.actor) == null ? void 0 : _c.key
@@ -18170,6 +18192,7 @@ async function sendHttpRequest(opts) {
         responseData.message,
         {
           metadata: responseData.metadata,
+          rayId: rayId ?? void 0,
           actor: responseData.actor
         }
       );
@@ -18349,11 +18372,8 @@ async function rawHttpFetch(driver, target, params, input, init, options = {}) {
     });
     return driver.sendRequest(target, proxyRequest, options);
   } catch (err) {
-    const { group, code, message, metadata, actor: actor2 } = deconstructError(
-      err,
-      true
-    );
-    throw new RivetError(group, code, message, { metadata, actor: actor2 });
+    const { group, code, message, metadata, rayId, actor: actor2 } = deconstructError(err, true);
+    throw new RivetError(group, code, message, { metadata, rayId, actor: actor2 });
   }
 }
 async function rawWebSocket(driver, target, params, path2, _protocols, options = {}) {
@@ -18468,7 +18488,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 {
@@ -18492,7 +18512,7 @@ var ActorHandleRaw = class {
             }
           }).send(name, body, options);
         } catch (err) {
-          const { group, code, message, metadata, actor: actor2 } = deconstructError(err, true);
+          const { group, code, message, metadata, rayId, actor: actor2 } = deconstructError(err, true);
           if (this.#shouldRetryQueueDispatchOverload(
             group,
             code,
@@ -18508,7 +18528,8 @@ var ActorHandleRaw = class {
             code,
             actorId,
             attempt,
-            maxAttempts
+            maxAttempts,
+            rayId
           )) {
             useQueryTarget = true;
             await this.#waitForRetryWindow();
@@ -18530,14 +18551,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 RivetError(group, code, message, {
             metadata,
+            rayId,
             actor: actor2
           });
         }
@@ -18566,7 +18589,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
@@ -18631,13 +18654,14 @@ var ActorHandleRaw = class {
         }
         return output;
       } catch (err) {
-        const { group, code, message, metadata, actor: actor2 } = deconstructError(err, true);
+        const { group, code, message, metadata, rayId, actor: actor2 } = deconstructError(err, true);
         if (await this.#shouldRetrySchedulingError(
           group,
           code,
           actorId,
           attempt,
-          maxAttempts
+          maxAttempts,
+          rayId
         )) {
           useQueryTarget = true;
           await this.#waitForRetryWindow();
@@ -18659,7 +18683,7 @@ var ActorHandleRaw = class {
             "actor",
             "not_found",
             "The actor does not exist or was destroyed.",
-            { metadata, actor: actor2 }
+            { metadata, rayId, actor: actor2 }
           );
         }
         const invalidated = this.#invalidateResolvedActorId(
@@ -18675,7 +18699,11 @@ var ActorHandleRaw = class {
           }
           continue;
         }
-        throw new RivetError(group, code, message, { metadata, actor: actor2 });
+        throw new RivetError(group, code, message, {
+          metadata,
+          rayId,
+          actor: actor2
+        });
       }
     }
     throw new Error("unreachable action retry state");
@@ -18717,7 +18745,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;
     }
@@ -18727,7 +18755,8 @@ var ActorHandleRaw = class {
         code,
         actorId,
         this.#actorResolutionState,
-        this.#driver
+        this.#driver,
+        rayId
       );
       if (schedulingError) {
         throw schedulingError;
@@ -18809,7 +18838,7 @@ var ActorHandleRaw = class {
   }
   async #fetchWithResolvedActor(input, init) {
     const maxAttempts = this.#getDynamicQueryMaxAttempts();
-    let useQueryTarget = false;
+    let useQueryTarget = isDynamicActorQuery(this.#actorResolutionState);
     const { skipReadyWait, ...requestInit } = init ?? {};
     const gatewayOptions = resolveActorGatewayOptions(
       this.#gatewayOptions,
@@ -18848,13 +18877,14 @@ var ActorHandleRaw = class {
         }
         return response;
       } catch (err) {
-        const { group, code, message, metadata, actor: actor2 } = deconstructError(err, true);
+        const { group, code, message, metadata, rayId, actor: actor2 } = deconstructError(err, true);
         if (await this.#shouldRetrySchedulingError(
           group,
           code,
           actorId,
           attempt,
-          maxAttempts
+          maxAttempts,
+          rayId
         )) {
           useQueryTarget = true;
           await this.#waitForRetryWindow();
@@ -18876,13 +18906,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 RivetError(group, code, message, { metadata, actor: actor2 });
+        throw new RivetError(group, code, message, {
+          metadata,
+          rayId,
+          actor: actor2
+        });
       }
     }
     throw new Error("unreachable fetch retry state");
@@ -18895,13 +18930,14 @@ var ActorHandleRaw = class {
     if (!error46) {
       return null;
     }
-    const { group, code } = error46;
+    const { group, code, rayId } = error46;
     if (await this.#shouldRetrySchedulingError(
       group,
       code,
       actorId,
       attempt,
-      maxAttempts
+      maxAttempts,
+      rayId
     )) {
       return {
         useQueryTarget: true,
@@ -18922,10 +18958,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;
@@ -18937,7 +18973,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 deserializeWithEncoding(
+      const error46 = deserializeWithEncoding(
         encoding,
         new Uint8Array(await response.clone().arrayBuffer()),
         HTTP_RESPONSE_ERROR_VERSIONED,
@@ -18961,6 +18997,10 @@ var ActorHandleRaw = class {
           } : void 0
         })
       );
+      return {
+        ...error46,
+        rayId: response.headers.get("x-rivet-ray-id") ?? void 0
+      };
     } catch {
       return null;
     }
@@ -19024,7 +19064,9 @@ var ActorHandleRaw = class {
         "actor",
         "reload_failed",
         `reload failed with status ${response.status}: ${body}`,
-        {}
+        {
+          rayId: response.headers.get("x-rivet-ray-id") ?? void 0
+        }
       );
     }
   }
@@ -19878,7 +19920,7 @@ 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();
           (_a2 = this.#onOpenPromise) == null ? void 0 : _a2.reject(
@@ -19886,7 +19928,7 @@ var ActorConnRaw = class {
               group,
               code,
               `Connection closed: ${reason}`,
-              void 0
+              { rayId }
             )
           );
           return;
@@ -19897,7 +19939,8 @@ var ActorConnRaw = class {
             code,
             this.#actorId,
             this.#actorResolutionState,
-            this.#driver
+            this.#driver,
+            rayId
           );
           if (schedulingError) {
             error46 = schedulingError;
@@ -19906,7 +19949,7 @@ var ActorConnRaw = class {
               group,
               code,
               `Connection closed: ${reason}`,
-              void 0
+              { rayId }
             );
           }
         } else {
@@ -19914,7 +19957,7 @@ var ActorConnRaw = class {
             group,
             code,
             `Connection closed: ${reason}`,
-            void 0
+            { rayId }
           );
         }
         this.#invalidateActorIfStale(group, code);
@@ -21291,24 +21334,45 @@ var RemoteEngineControlClient = class {
       name,
       key
     });
-    const { actor: actor2, created } = await getOrCreateActor(this.#config, {
-      datacenter: region,
-      name,
-      key: serializeActorKey(key),
-      runner_name_selector: poolName ?? this.#config.poolName,
-      input: actorInput ? uint8ArrayToBase642(
-        encodeCborCompat(actorInput)
-      ) : void 0,
-      crash_policy: crashPolicy ?? "sleep"
-    });
-    logger2().info({
-      msg: "getOrCreateWithKey: actor ready",
-      actorId: actor2.actor_id,
-      name,
-      key,
-      created
-    });
-    return apiActorToOutput(actor2);
+    try {
+      const { actor: actor2, created } = await getOrCreateActor(this.#config, {
+        datacenter: region,
+        name,
+        key: serializeActorKey(key),
+        runner_name_selector: poolName ?? this.#config.poolName,
+        input: actorInput ? uint8ArrayToBase642(
+          encodeCborCompat(actorInput)
+        ) : void 0,
+        crash_policy: crashPolicy ?? "sleep"
+      });
+      logger2().info({
+        msg: "getOrCreateWithKey: actor ready",
+        actorId: actor2.actor_id,
+        name,
+        key,
+        created
+      });
+      return apiActorToOutput(actor2);
+    } catch (error46) {
+      if (error46 instanceof RivetError && error46.group === "actor" && error46.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 error46;
+        logger2().info({
+          msg: "getOrCreateWithKey: resolved existing actor via get",
+          actorId: existing.actor_id,
+          name,
+          key
+        });
+        return apiActorToOutput(existing);
+      }
+      throw error46;
+    }
   }
   async createActor({
     name,
@@ -21509,7 +21573,7 @@ function apiActorToOutput(actor2) {
   };
 }
 
-// ../rivetkit/dist/tsup/chunk-KRPA4UOE.js
+// ../rivetkit/dist/tsup/chunk-PSXMESQJ.js
 var nativeStateTransactionOpeners = /* @__PURE__ */ new WeakMap();
 var nativeStateTransactionClientBinders = /* @__PURE__ */ new WeakMap();
 function registerNativeStateTransactionOpener(provider, opener) {
@@ -26406,7 +26470,8 @@ function encodeNativeCallbackError(error46) {
   return Object.assign(bridgeError, {
     group: structuredError.group,
     code: structuredError.code,
-    metadata: structuredError.metadata
+    metadata: structuredError.metadata,
+    rayId: structuredError.rayId
   });
 }
 async function callNative(invoke) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rivetkit/supabase",
-	"version": "2.3.12-rc.1",
+	"version": "2.3.12-rc.3",
 	"description": "Supabase Edge Functions integration for RivetKit actors",
 	"license": "Apache-2.0",
 	"keywords": [
@@ -39,14 +39,14 @@
 		"check-edge-closure": "node ../../../scripts/ci/check-edge-native-closure.mjs"
 	},
 	"dependencies": {
-		"@rivetkit/rivetkit-wasm": "2.3.12-rc.1",
+		"@rivetkit/rivetkit-wasm": "2.3.12-rc.3",
 		"cbor-x": "^1.6.0",
 		"pino": "^9.5.0"
 	},
 	"devDependencies": {
 		"@size-limit/file": "^11.1.6",
 		"@types/node": "^22.0.0",
-		"rivetkit": "2.3.12-rc.1",
+		"rivetkit": "2.3.12-rc.3",
 		"size-limit": "^11.1.6",
 		"tsup": "^8.4.0",
 		"typescript": "^5.5.2"