rivetkit 2.3.0-rc.5 → 2.3.0-rc.7

package/dist/browser/client.js

@@ -3,7 +3,7 @@ var INTERNAL_ERROR_CODE = "internal_error";
 var INTERNAL_ERROR_DESCRIPTION = "An internal error occurred";
 var USER_ERROR_CODE = "user_error";
 function looksLikeRivetErrorOptions(value) {
-  return typeof value === "object" && value !== null && ("public" in value || "metadata" in value || "statusCode" in value || "cause" in value);
+  return typeof value === "object" && value !== null && ("public" in value || "metadata" in value || "statusCode" in value || "actor" in value || "cause" in value);
 }
 function isTypedErrorTag(value) {
   return value === "ActorError" || value === "RivetError";
@@ -22,6 +22,7 @@ var RivetError = class extends Error {
   public;
   metadata;
   statusCode;
+  actor;
   group;
   code;
   static isRivetError(error) {
@@ -39,6 +40,7 @@ var RivetError = class extends Error {
     this.public = normalized.public ?? false;
     this.metadata = normalized.metadata;
     this.statusCode = normalized.statusCode ?? (this.public ? 400 : 500);
+    this.actor = normalized.actor;
   }
   toString() {
     return this.message;
@@ -93,13 +95,14 @@ function assertUnreachable(x) {
 function isCanonicalStructuredRivetError(error) {
   return error instanceof RivetError || typeof error === "object" && error !== null && "__type" in error && error.__type === "RivetError" && "group" in error && typeof error.group === "string" && "code" in error && typeof error.code === "string" && "message" in error && typeof error.message === "string";
 }
-function deconstructError(error, logger4, extraLog, exposeInternalError = false) {
+function deconstructError(error, exposeInternalError = false) {
   let statusCode;
   let public_;
   let group;
   let code;
   let message;
   let metadata;
+  let actor;
   if (isCanonicalStructuredRivetError(error)) {
     statusCode = typeof error.statusCode === "number" ? error.statusCode : error.public ? 400 : 500;
     public_ = error.public ?? false;
@@ -107,14 +110,7 @@ function deconstructError(error, logger4, extraLog, exposeInternalError = false)
     code = error.code;
     message = error.message;
     metadata = error.metadata;
-    logger4.info({
-      msg: "structured error passthrough",
-      group,
-      code,
-      message,
-      ...EXTRA_ERROR_LOG,
-      ...extraLog
-    });
+    actor = error.actor;
   } else if (RivetError.isActorError(error) && error.public) {
     statusCode = "statusCode" in error && error.statusCode ? error.statusCode : 400;
     public_ = true;
@@ -122,14 +118,7 @@ function deconstructError(error, logger4, extraLog, exposeInternalError = false)
     code = error.code;
     message = getErrorMessage(error);
     metadata = error.metadata;
-    logger4.info({
-      msg: "public error",
-      group,
-      code,
-      message,
-      ...EXTRA_ERROR_LOG,
-      ...extraLog
-    });
+    actor = error.actor;
   } else if (exposeInternalError) {
     if (RivetError.isActorError(error)) {
       statusCode = 500;
@@ -138,30 +127,13 @@ function deconstructError(error, logger4, extraLog, exposeInternalError = false)
       code = error.code;
       message = getErrorMessage(error);
       metadata = error.metadata;
-      logger4.info({
-        msg: "internal error",
-        group,
-        code,
-        message,
-        stack: error?.stack,
-        ...EXTRA_ERROR_LOG,
-        ...extraLog
-      });
+      actor = error.actor;
     } else {
       statusCode = 500;
       public_ = false;
       group = "rivetkit";
       code = INTERNAL_ERROR_CODE;
       message = getErrorMessage(error);
-      logger4.info({
-        msg: "internal error",
-        group,
-        code,
-        message,
-        stack: error?.stack,
-        ...EXTRA_ERROR_LOG,
-        ...extraLog
-      });
     }
   } else {
     statusCode = 500;
@@ -169,16 +141,12 @@ function deconstructError(error, logger4, extraLog, exposeInternalError = false)
     group = "rivetkit";
     code = INTERNAL_ERROR_CODE;
     message = INTERNAL_ERROR_DESCRIPTION;
+    if (RivetError.isActorError(error)) {
+      actor = error.actor;
+    }
     metadata = {
       //url: `https://hub.rivet.dev/projects/${actorMetadata.project.slug}/environments/${actorMetadata.environment.slug}/actors?actorId=${actorMetadata.actor.id}`,
     };
-    logger4.warn({
-      msg: "internal error",
-      error: getErrorMessage(error),
-      stack: error?.stack,
-      ...EXTRA_ERROR_LOG,
-      ...extraLog
-    });
   }
   return {
     __type: "ActorError",
@@ -187,7 +155,8 @@ function deconstructError(error, logger4, extraLog, exposeInternalError = false)
     group,
     code,
     message,
-    metadata
+    metadata,
+    actor
   };
 }
 function stringifyError(error) {
@@ -231,7 +200,7 @@ function noopNext() {
 // package.json
 var package_default = {
   name: "rivetkit",
-  version: "2.3.0-rc.5",
+  version: "2.3.0-rc.7",
   description: "Lightweight libraries for building stateful actors on edge platforms",
   license: "Apache-2.0",
   keywords: [
@@ -399,13 +368,14 @@ var package_default = {
     "actor-config-schema-gen": "tsx scripts/actor-config-schema-gen.ts"
   },
   dependencies: {
-    "@rivet-dev/agent-os-core": "^0.1.1",
     "@hono/node-server": "^1.18.2",
     "@hono/node-ws": "^1.1.1",
     "@hono/zod-openapi": "^1.1.5",
+    "@rivet-dev/agent-os-core": "^0.1.1",
     "@rivetkit/bare-ts": "^0.6.2",
     "@rivetkit/engine-cli": "workspace:*",
     "@rivetkit/engine-envoy-protocol": "workspace:*",
+    "@rivetkit/on-change": "6.0.1",
     "@rivetkit/rivetkit-napi": "workspace:*",
     "@rivetkit/rivetkit-wasm": "workspace:*",
     "@rivetkit/traces": "workspace:*",
@@ -423,10 +393,10 @@ var package_default = {
     zod: "^4.1.0"
   },
   devDependencies: {
+    "@biomejs/biome": "^2.3",
     "@copilotkit/llmock": "^1.6.0",
     "@rivet-dev/agent-os-common": "*",
     "@rivet-dev/agent-os-pi": "^0.1.1",
-    "@biomejs/biome": "^2.3",
     "@standard-schema/spec": "^1.0.0",
     "@types/invariant": "^2",
     "@types/node": "^22.13.1",
@@ -502,6 +472,7 @@ function configureDefaultLogger(logLevel) {
       messageKey: "msg",
       // Do not include pid/hostname in output
       base: {},
+      errorKey: "error",
       // Keep the numeric level so the logfmt sink can match Pino's levels.
       formatters: {
         level(_label, number) {
@@ -666,11 +637,6 @@ function combineUrlPath(endpoint, path, queryParams) {
   const fullQuery = queryParts.length > 0 ? `?${queryParts.join("&")}` : "";
   return `${baseUrl.protocol}//${baseUrl.host}${fullPath}${fullQuery}`;
 }
-var EXTRA_ERROR_LOG = {
-  issues: "https://github.com/rivet-dev/rivet/issues",
-  support: "https://rivet.dev/discord",
-  version: VERSION
-};
 
 // src/devtools-loader/log.ts
 function logger() {
@@ -841,6 +807,10 @@ var JSON_COMPAT_BIGINT = "$BigInt";
 var JSON_COMPAT_ARRAY_BUFFER = "$ArrayBuffer";
 var JSON_COMPAT_UINT8_ARRAY = "$Uint8Array";
 var JSON_COMPAT_UNDEFINED = "$Undefined";
+var JSON_COMPAT_SET = "$Set";
+function isTypedArray(value) {
+  return value instanceof Uint8ClampedArray || value instanceof Uint16Array || value instanceof Uint32Array || value instanceof BigUint64Array || value instanceof Int8Array || value instanceof Int16Array || value instanceof Int32Array || value instanceof BigInt64Array || value instanceof Float32Array || value instanceof Float64Array;
+}
 var EncodingSchema = z2.enum(["json", "cbor", "bare"]);
 async function inputDataToBuffer(data) {
   if (typeof data === "string") {
@@ -875,9 +845,15 @@ function isPlainObject(value) {
   return proto === Object.prototype || proto === null;
 }
 function encodeJsonCompatValue(input) {
+  if (input === null) {
+    return input;
+  }
   if (input === void 0) {
     return [JSON_COMPAT_UNDEFINED, 0];
   }
+  if (typeof input === "string" || typeof input === "number" || typeof input === "boolean") {
+    return input;
+  }
   if (typeof input === "bigint") {
     return [JSON_COMPAT_BIGINT, input.toString()];
   }
@@ -887,8 +863,32 @@ function encodeJsonCompatValue(input) {
   if (input instanceof Uint8Array) {
     return [JSON_COMPAT_UINT8_ARRAY, base64EncodeUint8Array(input)];
   }
+  if (isTypedArray(input)) {
+    return input;
+  }
+  if (input instanceof Date || input instanceof RegExp || input instanceof Error) {
+    return input;
+  }
+  if (input instanceof Set) {
+    const encoded = [...input.values()].map(
+      (v) => encodeJsonCompatValue(v)
+    );
+    return [JSON_COMPAT_SET, encoded];
+  }
+  if (input instanceof Map) {
+    const encoded = /* @__PURE__ */ new Map();
+    for (const [k, v] of input.entries()) {
+      encoded.set(
+        encodeJsonCompatValue(k),
+        encodeJsonCompatValue(v)
+      );
+    }
+    return encoded;
+  }
   if (Array.isArray(input)) {
-    const encoded = input.map((value) => encodeJsonCompatValue(value));
+    const encoded = input.map(
+      (value) => encodeJsonCompatValue(value)
+    );
     if (encoded.length === 2 && typeof encoded[0] === "string" && encoded[0].startsWith("$")) {
       return ["$" + encoded[0], encoded[1]];
     }
@@ -901,7 +901,10 @@ function encodeJsonCompatValue(input) {
     }
     return encoded;
   }
-  return input;
+  const typeName = typeof input === "object" && input !== null ? input.constructor?.name ?? typeof input : typeof input;
+  throw new TypeError(
+    `Value of type "${typeName}" is not CBOR serializable`
+  );
 }
 function reviveJsonCompatValue(input, options = {}) {
   if (typeof input === "bigint") {
@@ -910,6 +913,16 @@ function reviveJsonCompatValue(input, options = {}) {
     }
     return input;
   }
+  if (input instanceof Map) {
+    const revived = /* @__PURE__ */ new Map();
+    for (const [k, v] of input.entries()) {
+      revived.set(
+        reviveJsonCompatValue(k, options),
+        reviveJsonCompatValue(v, options)
+      );
+    }
+    return revived;
+  }
   if (Array.isArray(input)) {
     if (input.length === 2 && typeof input[0] === "string" && input[0].startsWith("$")) {
       if (input[0] === JSON_COMPAT_BIGINT) {
@@ -924,6 +937,12 @@ function reviveJsonCompatValue(input, options = {}) {
       if (input[0] === JSON_COMPAT_UNDEFINED) {
         return void 0;
       }
+      if (input[0] === JSON_COMPAT_SET) {
+        const items = input[1].map(
+          (v) => reviveJsonCompatValue(v, options)
+        );
+        return new Set(items);
+      }
       if (input[0].startsWith("$$")) {
         return [
           input[0].substring(1),
@@ -2694,8 +2713,440 @@ function decodeHttpResolveResponse3(bytes) {
   return result;
 }
 
+// src/common/bare/generated/client-protocol/v4.ts
+import * as bare4 from "@rivetkit/bare-ts";
+var DEFAULT_CONFIG4 = /* @__PURE__ */ bare4.Config({});
+function readCbor4(bc) {
+  return bare4.readData(bc);
+}
+function writeCbor4(bc, x) {
+  bare4.writeData(bc, x);
+}
+function read04(bc) {
+  return bare4.readBool(bc) ? bare4.readString(bc) : null;
+}
+function write04(bc, x) {
+  bare4.writeBool(bc, x != null);
+  if (x != null) {
+    bare4.writeString(bc, x);
+  }
+}
+function readActorSpecifier(bc) {
+  return {
+    actorId: bare4.readString(bc),
+    generation: bare4.readUint(bc),
+    key: read04(bc)
+  };
+}
+function writeActorSpecifier(bc, x) {
+  bare4.writeString(bc, x.actorId);
+  bare4.writeUint(bc, x.generation);
+  write04(bc, x.key);
+}
+function readInit4(bc) {
+  return {
+    actorId: bare4.readString(bc),
+    connectionId: bare4.readString(bc)
+  };
+}
+function writeInit4(bc, x) {
+  bare4.writeString(bc, x.actorId);
+  bare4.writeString(bc, x.connectionId);
+}
+function read14(bc) {
+  return bare4.readBool(bc) ? readCbor4(bc) : null;
+}
+function write14(bc, x) {
+  bare4.writeBool(bc, x != null);
+  if (x != null) {
+    writeCbor4(bc, x);
+  }
+}
+function read22(bc) {
+  return bare4.readBool(bc) ? bare4.readUint(bc) : null;
+}
+function write22(bc, x) {
+  bare4.writeBool(bc, x != null);
+  if (x != null) {
+    bare4.writeUint(bc, x);
+  }
+}
+function read32(bc) {
+  return bare4.readBool(bc) ? readActorSpecifier(bc) : null;
+}
+function write32(bc, x) {
+  bare4.writeBool(bc, x != null);
+  if (x != null) {
+    writeActorSpecifier(bc, x);
+  }
+}
+function readError4(bc) {
+  return {
+    group: bare4.readString(bc),
+    code: bare4.readString(bc),
+    message: bare4.readString(bc),
+    metadata: read14(bc),
+    actionId: read22(bc),
+    actor: read32(bc)
+  };
+}
+function writeError4(bc, x) {
+  bare4.writeString(bc, x.group);
+  bare4.writeString(bc, x.code);
+  bare4.writeString(bc, x.message);
+  write14(bc, x.metadata);
+  write22(bc, x.actionId);
+  write32(bc, x.actor);
+}
+function readActionResponse4(bc) {
+  return {
+    id: bare4.readUint(bc),
+    output: readCbor4(bc)
+  };
+}
+function writeActionResponse4(bc, x) {
+  bare4.writeUint(bc, x.id);
+  writeCbor4(bc, x.output);
+}
+function readEvent4(bc) {
+  return {
+    name: bare4.readString(bc),
+    args: readCbor4(bc)
+  };
+}
+function writeEvent4(bc, x) {
+  bare4.writeString(bc, x.name);
+  writeCbor4(bc, x.args);
+}
+function readToClientBody4(bc) {
+  const offset = bc.offset;
+  const tag = bare4.readU8(bc);
+  switch (tag) {
+    case 0:
+      return { tag: "Init", val: readInit4(bc) };
+    case 1:
+      return { tag: "Error", val: readError4(bc) };
+    case 2:
+      return { tag: "ActionResponse", val: readActionResponse4(bc) };
+    case 3:
+      return { tag: "Event", val: readEvent4(bc) };
+    default: {
+      bc.offset = offset;
+      throw new bare4.BareError(offset, "invalid tag");
+    }
+  }
+}
+function writeToClientBody4(bc, x) {
+  switch (x.tag) {
+    case "Init": {
+      bare4.writeU8(bc, 0);
+      writeInit4(bc, x.val);
+      break;
+    }
+    case "Error": {
+      bare4.writeU8(bc, 1);
+      writeError4(bc, x.val);
+      break;
+    }
+    case "ActionResponse": {
+      bare4.writeU8(bc, 2);
+      writeActionResponse4(bc, x.val);
+      break;
+    }
+    case "Event": {
+      bare4.writeU8(bc, 3);
+      writeEvent4(bc, x.val);
+      break;
+    }
+  }
+}
+function readToClient4(bc) {
+  return {
+    body: readToClientBody4(bc)
+  };
+}
+function writeToClient4(bc, x) {
+  writeToClientBody4(bc, x.body);
+}
+function encodeToClient4(x, config) {
+  const fullConfig = config != null ? bare4.Config(config) : DEFAULT_CONFIG4;
+  const bc = new bare4.ByteCursor(
+    new Uint8Array(fullConfig.initialBufferLength),
+    fullConfig
+  );
+  writeToClient4(bc, x);
+  return new Uint8Array(bc.view.buffer, bc.view.byteOffset, bc.offset);
+}
+function decodeToClient4(bytes) {
+  const bc = new bare4.ByteCursor(bytes, DEFAULT_CONFIG4);
+  const result = readToClient4(bc);
+  if (bc.offset < bc.view.byteLength) {
+    throw new bare4.BareError(bc.offset, "remaining bytes");
+  }
+  return result;
+}
+function readActionRequest4(bc) {
+  return {
+    id: bare4.readUint(bc),
+    name: bare4.readString(bc),
+    args: readCbor4(bc)
+  };
+}
+function writeActionRequest4(bc, x) {
+  bare4.writeUint(bc, x.id);
+  bare4.writeString(bc, x.name);
+  writeCbor4(bc, x.args);
+}
+function readSubscriptionRequest4(bc) {
+  return {
+    eventName: bare4.readString(bc),
+    subscribe: bare4.readBool(bc)
+  };
+}
+function writeSubscriptionRequest4(bc, x) {
+  bare4.writeString(bc, x.eventName);
+  bare4.writeBool(bc, x.subscribe);
+}
+function readToServerBody4(bc) {
+  const offset = bc.offset;
+  const tag = bare4.readU8(bc);
+  switch (tag) {
+    case 0:
+      return { tag: "ActionRequest", val: readActionRequest4(bc) };
+    case 1:
+      return { tag: "SubscriptionRequest", val: readSubscriptionRequest4(bc) };
+    default: {
+      bc.offset = offset;
+      throw new bare4.BareError(offset, "invalid tag");
+    }
+  }
+}
+function writeToServerBody4(bc, x) {
+  switch (x.tag) {
+    case "ActionRequest": {
+      bare4.writeU8(bc, 0);
+      writeActionRequest4(bc, x.val);
+      break;
+    }
+    case "SubscriptionRequest": {
+      bare4.writeU8(bc, 1);
+      writeSubscriptionRequest4(bc, x.val);
+      break;
+    }
+  }
+}
+function readToServer4(bc) {
+  return {
+    body: readToServerBody4(bc)
+  };
+}
+function writeToServer4(bc, x) {
+  writeToServerBody4(bc, x.body);
+}
+function encodeToServer4(x, config) {
+  const fullConfig = config != null ? bare4.Config(config) : DEFAULT_CONFIG4;
+  const bc = new bare4.ByteCursor(
+    new Uint8Array(fullConfig.initialBufferLength),
+    fullConfig
+  );
+  writeToServer4(bc, x);
+  return new Uint8Array(bc.view.buffer, bc.view.byteOffset, bc.offset);
+}
+function decodeToServer4(bytes) {
+  const bc = new bare4.ByteCursor(bytes, DEFAULT_CONFIG4);
+  const result = readToServer4(bc);
+  if (bc.offset < bc.view.byteLength) {
+    throw new bare4.BareError(bc.offset, "remaining bytes");
+  }
+  return result;
+}
+function readHttpActionRequest4(bc) {
+  return {
+    args: readCbor4(bc)
+  };
+}
+function writeHttpActionRequest4(bc, x) {
+  writeCbor4(bc, x.args);
+}
+function encodeHttpActionRequest4(x, config) {
+  const fullConfig = config != null ? bare4.Config(config) : DEFAULT_CONFIG4;
+  const bc = new bare4.ByteCursor(
+    new Uint8Array(fullConfig.initialBufferLength),
+    fullConfig
+  );
+  writeHttpActionRequest4(bc, x);
+  return new Uint8Array(bc.view.buffer, bc.view.byteOffset, bc.offset);
+}
+function decodeHttpActionRequest4(bytes) {
+  const bc = new bare4.ByteCursor(bytes, DEFAULT_CONFIG4);
+  const result = readHttpActionRequest4(bc);
+  if (bc.offset < bc.view.byteLength) {
+    throw new bare4.BareError(bc.offset, "remaining bytes");
+  }
+  return result;
+}
+function readHttpActionResponse4(bc) {
+  return {
+    output: readCbor4(bc)
+  };
+}
+function writeHttpActionResponse4(bc, x) {
+  writeCbor4(bc, x.output);
+}
+function encodeHttpActionResponse4(x, config) {
+  const fullConfig = config != null ? bare4.Config(config) : DEFAULT_CONFIG4;
+  const bc = new bare4.ByteCursor(
+    new Uint8Array(fullConfig.initialBufferLength),
+    fullConfig
+  );
+  writeHttpActionResponse4(bc, x);
+  return new Uint8Array(bc.view.buffer, bc.view.byteOffset, bc.offset);
+}
+function decodeHttpActionResponse4(bytes) {
+  const bc = new bare4.ByteCursor(bytes, DEFAULT_CONFIG4);
+  const result = readHttpActionResponse4(bc);
+  if (bc.offset < bc.view.byteLength) {
+    throw new bare4.BareError(bc.offset, "remaining bytes");
+  }
+  return result;
+}
+function read42(bc) {
+  return bare4.readBool(bc) ? bare4.readBool(bc) : null;
+}
+function write42(bc, x) {
+  bare4.writeBool(bc, x != null);
+  if (x != null) {
+    bare4.writeBool(bc, x);
+  }
+}
+function read5(bc) {
+  return bare4.readBool(bc) ? bare4.readU64(bc) : null;
+}
+function write5(bc, x) {
+  bare4.writeBool(bc, x != null);
+  if (x != null) {
+    bare4.writeU64(bc, x);
+  }
+}
+function readHttpQueueSendRequest2(bc) {
+  return {
+    body: readCbor4(bc),
+    name: read04(bc),
+    wait: read42(bc),
+    timeout: read5(bc)
+  };
+}
+function writeHttpQueueSendRequest2(bc, x) {
+  writeCbor4(bc, x.body);
+  write04(bc, x.name);
+  write42(bc, x.wait);
+  write5(bc, x.timeout);
+}
+function encodeHttpQueueSendRequest2(x, config) {
+  const fullConfig = config != null ? bare4.Config(config) : DEFAULT_CONFIG4;
+  const bc = new bare4.ByteCursor(
+    new Uint8Array(fullConfig.initialBufferLength),
+    fullConfig
+  );
+  writeHttpQueueSendRequest2(bc, x);
+  return new Uint8Array(bc.view.buffer, bc.view.byteOffset, bc.offset);
+}
+function decodeHttpQueueSendRequest2(bytes) {
+  const bc = new bare4.ByteCursor(bytes, DEFAULT_CONFIG4);
+  const result = readHttpQueueSendRequest2(bc);
+  if (bc.offset < bc.view.byteLength) {
+    throw new bare4.BareError(bc.offset, "remaining bytes");
+  }
+  return result;
+}
+function readHttpQueueSendResponse2(bc) {
+  return {
+    status: bare4.readString(bc),
+    response: read14(bc)
+  };
+}
+function writeHttpQueueSendResponse2(bc, x) {
+  bare4.writeString(bc, x.status);
+  write14(bc, x.response);
+}
+function encodeHttpQueueSendResponse2(x, config) {
+  const fullConfig = config != null ? bare4.Config(config) : DEFAULT_CONFIG4;
+  const bc = new bare4.ByteCursor(
+    new Uint8Array(fullConfig.initialBufferLength),
+    fullConfig
+  );
+  writeHttpQueueSendResponse2(bc, x);
+  return new Uint8Array(bc.view.buffer, bc.view.byteOffset, bc.offset);
+}
+function decodeHttpQueueSendResponse2(bytes) {
+  const bc = new bare4.ByteCursor(bytes, DEFAULT_CONFIG4);
+  const result = readHttpQueueSendResponse2(bc);
+  if (bc.offset < bc.view.byteLength) {
+    throw new bare4.BareError(bc.offset, "remaining bytes");
+  }
+  return result;
+}
+function readHttpResponseError4(bc) {
+  return {
+    group: bare4.readString(bc),
+    code: bare4.readString(bc),
+    message: bare4.readString(bc),
+    metadata: read14(bc),
+    actor: read32(bc)
+  };
+}
+function writeHttpResponseError4(bc, x) {
+  bare4.writeString(bc, x.group);
+  bare4.writeString(bc, x.code);
+  bare4.writeString(bc, x.message);
+  write14(bc, x.metadata);
+  write32(bc, x.actor);
+}
+function encodeHttpResponseError4(x, config) {
+  const fullConfig = config != null ? bare4.Config(config) : DEFAULT_CONFIG4;
+  const bc = new bare4.ByteCursor(
+    new Uint8Array(fullConfig.initialBufferLength),
+    fullConfig
+  );
+  writeHttpResponseError4(bc, x);
+  return new Uint8Array(bc.view.buffer, bc.view.byteOffset, bc.offset);
+}
+function decodeHttpResponseError4(bytes) {
+  const bc = new bare4.ByteCursor(bytes, DEFAULT_CONFIG4);
+  const result = readHttpResponseError4(bc);
+  if (bc.offset < bc.view.byteLength) {
+    throw new bare4.BareError(bc.offset, "remaining bytes");
+  }
+  return result;
+}
+function readHttpResolveResponse4(bc) {
+  return {
+    actorId: bare4.readString(bc)
+  };
+}
+function writeHttpResolveResponse4(bc, x) {
+  bare4.writeString(bc, x.actorId);
+}
+function encodeHttpResolveResponse4(x, config) {
+  const fullConfig = config != null ? bare4.Config(config) : DEFAULT_CONFIG4;
+  const bc = new bare4.ByteCursor(
+    new Uint8Array(fullConfig.initialBufferLength),
+    fullConfig
+  );
+  writeHttpResolveResponse4(bc, x);
+  return new Uint8Array(bc.view.buffer, bc.view.byteOffset, bc.offset);
+}
+function decodeHttpResolveResponse4(bytes) {
+  const bc = new bare4.ByteCursor(bytes, DEFAULT_CONFIG4);
+  const result = readHttpResolveResponse4(bc);
+  if (bc.offset < bc.view.byteLength) {
+    throw new bare4.BareError(bc.offset, "remaining bytes");
+  }
+  return result;
+}
+
 // src/common/client-protocol-versioned.ts
-var CURRENT_VERSION = 3;
+var CURRENT_VERSION = 4;
 var v1ToV2 = (v1Data) => {
   if (v1Data.body.tag === "Init") {
     const { actorId, connectionId } = v1Data.body.val;
@@ -2731,6 +3182,32 @@ var v2ToV1 = (v2Data) => {
 var v2ToV3 = (v2Data) => {
   return v2Data;
 };
+var v3ToV4 = (v3Data) => {
+  if (v3Data.body.tag === "Error") {
+    return {
+      body: {
+        tag: "Error",
+        val: {
+          ...v3Data.body.val,
+          actor: null
+        }
+      }
+    };
+  }
+  return v3Data;
+};
+var v4ToV3 = (v4Data) => {
+  if (v4Data.body.tag === "Error") {
+    const { actor: _, ...val } = v4Data.body.val;
+    return {
+      body: {
+        tag: "Error",
+        val
+      }
+    };
+  }
+  return v4Data;
+};
 var v3ToV2 = (v3Data) => {
   return v3Data;
 };
@@ -2740,12 +3217,26 @@ var v1ToServerV2 = (v1Data) => {
 var v2ToServerV3 = (v2Data) => {
   return v2Data;
 };
+var v3ToServerV4 = (v3Data) => {
+  return v3Data;
+};
+var v4ToServerV3 = (v4Data) => {
+  return v4Data;
+};
 var v3ToServerV2 = (v3Data) => {
   return v3Data;
 };
 var v2ToServerV1 = (v2Data) => {
   return v2Data;
 };
+var v3HttpResponseErrorToV4 = (v3Data) => ({
+  ...v3Data,
+  actor: null
+});
+var v4HttpResponseErrorToV3 = (v4Data) => {
+  const { actor: _, ...rest } = v4Data;
+  return rest;
+};
 var CLIENT_PROTOCOL_TO_SERVER = createVersionedDataHandler({
   deserializeVersion: (bytes, version) => {
     switch (version) {
@@ -2755,6 +3246,8 @@ var CLIENT_PROTOCOL_TO_SERVER = createVersionedDataHandler({
         return decodeToServer2(bytes);
       case 3:
         return decodeToServer3(bytes);
+      case 4:
+        return decodeToServer4(bytes);
       default:
         throw new Error(`Unknown version ${version}`);
     }
@@ -2767,12 +3260,14 @@ var CLIENT_PROTOCOL_TO_SERVER = createVersionedDataHandler({
         return encodeToServer2(data);
       case 3:
         return encodeToServer3(data);
+      case 4:
+        return encodeToServer4(data);
       default:
         throw new Error(`Unknown version ${version}`);
     }
   },
-  deserializeConverters: () => [v1ToServerV2, v2ToServerV3],
-  serializeConverters: () => [v3ToServerV2, v2ToServerV1]
+  deserializeConverters: () => [v1ToServerV2, v2ToServerV3, v3ToServerV4],
+  serializeConverters: () => [v4ToServerV3, v3ToServerV2, v2ToServerV1]
 });
 var CLIENT_PROTOCOL_TO_CLIENT = createVersionedDataHandler({
   deserializeVersion: (bytes, version) => {
@@ -2783,6 +3278,8 @@ var CLIENT_PROTOCOL_TO_CLIENT = createVersionedDataHandler({
         return decodeToClient2(bytes);
       case 3:
         return decodeToClient3(bytes);
+      case 4:
+        return decodeToClient4(bytes);
       default:
         throw new Error(`Unknown version ${version}`);
     }
@@ -2795,12 +3292,14 @@ var CLIENT_PROTOCOL_TO_CLIENT = createVersionedDataHandler({
         return encodeToClient2(data);
       case 3:
         return encodeToClient3(data);
+      case 4:
+        return encodeToClient4(data);
       default:
         throw new Error(`Unknown version ${version}`);
     }
   },
-  deserializeConverters: () => [v1ToV2, v2ToV3],
-  serializeConverters: () => [v3ToV2, v2ToV1]
+  deserializeConverters: () => [v1ToV2, v2ToV3, v3ToV4],
+  serializeConverters: () => [v4ToV3, v3ToV2, v2ToV1]
 });
 var HTTP_ACTION_REQUEST_VERSIONED = createVersionedDataHandler({
   deserializeVersion: (bytes, version) => {
@@ -2811,6 +3310,8 @@ var HTTP_ACTION_REQUEST_VERSIONED = createVersionedDataHandler({
         return decodeHttpActionRequest2(bytes);
       case 3:
         return decodeHttpActionRequest3(bytes);
+      case 4:
+        return decodeHttpActionRequest4(bytes);
       default:
         throw new Error(`Unknown version ${version}`);
     }
@@ -2829,6 +3330,10 @@ var HTTP_ACTION_REQUEST_VERSIONED = createVersionedDataHandler({
         return encodeHttpActionRequest3(
           data
         );
+      case 4:
+        return encodeHttpActionRequest4(
+          data
+        );
       default:
         throw new Error(`Unknown version ${version}`);
     }
@@ -2845,6 +3350,8 @@ var HTTP_ACTION_RESPONSE_VERSIONED = createVersionedDataHandler({
         return decodeHttpActionResponse2(bytes);
       case 3:
         return decodeHttpActionResponse3(bytes);
+      case 4:
+        return decodeHttpActionResponse4(bytes);
       default:
         throw new Error(`Unknown version ${version}`);
     }
@@ -2863,6 +3370,10 @@ var HTTP_ACTION_RESPONSE_VERSIONED = createVersionedDataHandler({
         return encodeHttpActionResponse3(
           data
         );
+      case 4:
+        return encodeHttpActionResponse4(
+          data
+        );
       default:
         throw new Error(`Unknown version ${version}`);
     }
@@ -2875,6 +3386,8 @@ var HTTP_QUEUE_SEND_REQUEST_VERSIONED = createVersionedDataHandler({
     switch (version) {
       case 3:
         return decodeHttpQueueSendRequest(bytes);
+      case 4:
+        return decodeHttpQueueSendRequest2(bytes);
       default:
         throw new Error(
           `HttpQueueSendRequest only exists in version 3+, got version ${version}`
@@ -2887,6 +3400,10 @@ var HTTP_QUEUE_SEND_REQUEST_VERSIONED = createVersionedDataHandler({
         return encodeHttpQueueSendRequest(
           data
         );
+      case 4:
+        return encodeHttpQueueSendRequest2(
+          data
+        );
       default:
         throw new Error(
           `HttpQueueSendRequest only exists in version 3+, got version ${version}`
@@ -2901,6 +3418,8 @@ var HTTP_QUEUE_SEND_RESPONSE_VERSIONED = createVersionedDataHandler({
     switch (version) {
       case 3:
         return decodeHttpQueueSendResponse(bytes);
+      case 4:
+        return decodeHttpQueueSendResponse2(bytes);
       default:
         throw new Error(
           `HttpQueueSendResponse only exists in version 3+, got version ${version}`
@@ -2913,6 +3432,10 @@ var HTTP_QUEUE_SEND_RESPONSE_VERSIONED = createVersionedDataHandler({
         return encodeHttpQueueSendResponse(
           data
         );
+      case 4:
+        return encodeHttpQueueSendResponse2(
+          data
+        );
       default:
         throw new Error(
           `HttpQueueSendResponse only exists in version 3+, got version ${version}`
@@ -2931,6 +3454,8 @@ var HTTP_RESPONSE_ERROR_VERSIONED = createVersionedDataHandler({
         return decodeHttpResponseError2(bytes);
       case 3:
         return decodeHttpResponseError3(bytes);
+      case 4:
+        return decodeHttpResponseError4(bytes);
       default:
         throw new Error(`Unknown version ${version}`);
     }
@@ -2949,12 +3474,24 @@ var HTTP_RESPONSE_ERROR_VERSIONED = createVersionedDataHandler({
         return encodeHttpResponseError3(
           data
         );
+      case 4:
+        return encodeHttpResponseError4(
+          data
+        );
       default:
         throw new Error(`Unknown version ${version}`);
     }
   },
-  deserializeConverters: () => [],
-  serializeConverters: () => []
+  deserializeConverters: () => [
+    (data) => data,
+    (data) => data,
+    v3HttpResponseErrorToV4
+  ],
+  serializeConverters: () => [
+    v4HttpResponseErrorToV3,
+    (data) => data,
+    (data) => data
+  ]
 });
 var HTTP_RESOLVE_RESPONSE_VERSIONED = createVersionedDataHandler({
   deserializeVersion: (bytes, version) => {
@@ -2965,6 +3502,8 @@ var HTTP_RESOLVE_RESPONSE_VERSIONED = createVersionedDataHandler({
         return decodeHttpResolveResponse2(bytes);
       case 3:
         return decodeHttpResolveResponse3(bytes);
+      case 4:
+        return decodeHttpResolveResponse4(bytes);
       default:
         throw new Error(`Unknown version ${version}`);
     }
@@ -2983,6 +3522,10 @@ var HTTP_RESOLVE_RESPONSE_VERSIONED = createVersionedDataHandler({
         return encodeHttpResolveResponse3(
           data
         );
+      case 4:
+        return encodeHttpResolveResponse4(
+          data
+        );
       default:
         throw new Error(`Unknown version ${version}`);
     }
@@ -2995,6 +3538,11 @@ var HTTP_RESOLVE_RESPONSE_VERSIONED = createVersionedDataHandler({
 import { z as z4 } from "zod/v4";
 var UintSchema = z4.bigint();
 var OptionalUintSchema = UintSchema.nullable();
+var ActorSpecifierSchema = z4.object({
+  actorId: z4.string(),
+  generation: z4.union([z4.number(), z4.bigint()]),
+  key: z4.string().optional()
+});
 var InitSchema = z4.object({
   actorId: z4.string(),
   connectionId: z4.string()
@@ -3004,7 +3552,8 @@ var ErrorSchema = z4.object({
   code: z4.string(),
   message: z4.string(),
   metadata: z4.unknown().optional(),
-  actionId: OptionalUintSchema
+  actionId: OptionalUintSchema,
+  actor: ActorSpecifierSchema.optional()
 });
 var ActionResponseSchema = z4.object({
   id: UintSchema,
@@ -3062,7 +3611,8 @@ var HttpResponseErrorSchema = z4.object({
   group: z4.string(),
   code: z4.string(),
   message: z4.string(),
-  metadata: z4.unknown().optional()
+  metadata: z4.unknown().optional(),
+  actor: ActorSpecifierSchema.optional()
 });
 var HttpResolveRequestSchema = z4.null();
 var HttpResolveResponseSchema = z4.object({
@@ -3192,21 +3742,45 @@ async function sendHttpRequest(opts) {
         new Uint8Array(bufferResponse),
         HTTP_RESPONSE_ERROR_VERSIONED,
         HttpResponseErrorSchema,
-        // JSON: metadata is already unknown
-        (json) => json,
+        // JSON/CBOR: normalize actor generation to the public number shape.
+        (json) => ({
+          ...json,
+          actor: json.actor ? {
+            ...json.actor,
+            generation: Number(json.actor.generation)
+          } : void 0
+        }),
         // BARE: decode ArrayBuffer metadata to unknown
-        (bare4) => ({
-          group: bare4.group,
-          code: bare4.code,
-          message: bare4.message,
-          metadata: bare4.metadata ? decodeCborCompat(new Uint8Array(bare4.metadata)) : void 0
+        (bare5) => ({
+          group: bare5.group,
+          code: bare5.code,
+          message: bare5.message,
+          metadata: bare5.metadata ? decodeCborCompat(new Uint8Array(bare5.metadata)) : void 0,
+          actor: bare5.actor ? {
+            actorId: bare5.actor.actorId,
+            generation: Number(bare5.actor.generation),
+            key: bare5.actor.key ?? void 0
+          } : void 0
         })
       );
+      logger2().warn({
+        msg: "http error response",
+        group: responseData.group,
+        code: responseData.code,
+        message: responseData.message,
+        metadata: responseData.metadata,
+        actorId: responseData.actor?.actorId,
+        generation: responseData.actor?.generation,
+        actorKey: responseData.actor?.key
+      });
       throw new RivetError(
         responseData.group,
         responseData.code,
         responseData.message,
-        responseData.metadata
+        {
+          metadata: responseData.metadata,
+          actor: responseData.actor
+        }
       );
     } catch (error) {
       if (error instanceof RivetError) {
@@ -4155,13 +4729,13 @@ function createQueueSender(senderOptions) {
           response: json.response
         };
       },
-      responseFromBare: (bare4) => {
-        if (bare4.response === null || bare4.response === void 0) {
-          return { status: bare4.status };
+      responseFromBare: (bare5) => {
+        if (bare5.response === null || bare5.response === void 0) {
+          return { status: bare5.status };
         }
         return {
-          status: bare4.status,
-          response: decodeCborCompat(new Uint8Array(bare4.response))
+          status: bare5.status,
+          response: decodeCborCompat(new Uint8Array(bare5.response))
         };
       }
     });
@@ -4175,49 +4749,7 @@ function createQueueSender(senderOptions) {
   };
 }
 
-// src/client/resolve-gateway-target.ts
-async function resolveGatewayTarget(driver, target) {
-  if ("directId" in target) {
-    return target.directId;
-  }
-  if ("getForId" in target) {
-    return target.getForId.actorId;
-  }
-  if ("getForKey" in target) {
-    const output = await driver.getWithKey({
-      name: target.getForKey.name,
-      key: target.getForKey.key
-    });
-    if (!output) {
-      throw actorNotFound(
-        `${target.getForKey.name}:${JSON.stringify(target.getForKey.key)}`
-      );
-    }
-    return output.actorId;
-  }
-  if ("getOrCreateForKey" in target) {
-    const output = await driver.getOrCreateWithKey({
-      name: target.getOrCreateForKey.name,
-      key: target.getOrCreateForKey.key,
-      input: target.getOrCreateForKey.input,
-      region: target.getOrCreateForKey.region
-    });
-    return output.actorId;
-  }
-  if ("create" in target) {
-    const output = await driver.createActor({
-      name: target.create.name,
-      key: target.create.key,
-      input: target.create.input,
-      region: target.create.region
-    });
-    return output.actorId;
-  }
-  throw invalidRequest("Invalid query format");
-}
-
 // src/client/actor-conn.ts
-var DEFAULT_MAX_INCOMING_MESSAGE_SIZE = 65536;
 var CONNECT_SYMBOL = /* @__PURE__ */ Symbol("connect");
 var ActorConnRaw = class {
   #disposed = false;
@@ -4286,7 +4818,9 @@ var ActorConnRaw = class {
         );
       }
     });
-    this.#keepNodeAliveInterval = setInterval(() => 6e4);
+    this.#keepNodeAliveInterval = setInterval(() => {
+    }, 6e4);
+    this.#keepNodeAliveInterval.unref?.();
   }
   #clearResolvedActorIdentity() {
     this.#actorId = void 0;
@@ -4519,7 +5053,7 @@ var ActorConnRaw = class {
   }
   async #connectWebSocket() {
     const params = await this.#resolveConnectionParams();
-    const target = this.#gatewayOptions.skipReadyWait ? await this.#resolveGatewayTargetForSkipReadyWait() : getGatewayTarget(this.#actorResolutionState);
+    const target = getGatewayTarget(this.#actorResolutionState);
     const ws = await this.#driver.openWebSocket(
       PATH_CONNECT,
       target,
@@ -4572,22 +5106,6 @@ var ActorConnRaw = class {
       }
     });
   }
-  async #resolveGatewayTargetForSkipReadyWait() {
-    if ("getForId" in this.#actorResolutionState) {
-      return {
-        directId: this.#actorResolutionState.getForId.actorId
-      };
-    }
-    if (this.#actorId) {
-      return { directId: this.#actorId };
-    }
-    return {
-      directId: await resolveGatewayTarget(
-        this.#driver,
-        this.#actorResolutionState
-      )
-    };
-  }
   /** Called by the onopen event from drivers. */
   #handleOnOpen() {
     if (this.#disposed) {
@@ -4666,7 +5184,7 @@ var ActorConnRaw = class {
       });
       this.#handleOnOpen();
     } else if (response.body.tag === "Error") {
-      const { group, code, message, metadata, actionId } = response.body.val;
+      const { group, code, message, metadata, actionId, actor } = response.body.val;
       if (actionId !== null) {
         const inFlight = this.#takeActionInFlight(Number(actionId));
         this.#invalidateActorIfStale(group, code);
@@ -4677,10 +5195,16 @@ var ActorConnRaw = class {
           group,
           code,
           message,
-          metadata
+          metadata,
+          actorId: actor?.actorId,
+          generation: actor?.generation,
+          actorKey: actor?.key
         });
         inFlight.reject(
-          new RivetError(group, code, message, metadata)
+          new RivetError(group, code, message, {
+            metadata,
+            actor
+          })
         );
       } else {
         logger2().warn({
@@ -4688,12 +5212,18 @@ var ActorConnRaw = class {
           group,
           code,
           message,
-          metadata
+          metadata,
+          actorId: actor?.actorId,
+          generation: actor?.generation,
+          actorKey: actor?.key
         });
         if (this.#shouldReconnectForStaleActor(group, code)) {
           this.#clearResolvedActorIdentity();
           this.#onOpenPromise?.reject(
-            new RivetError(group, code, message, metadata)
+            new RivetError(group, code, message, {
+              metadata,
+              actor
+            })
           );
           return;
         }
@@ -4701,7 +5231,7 @@ var ActorConnRaw = class {
           group,
           code,
           message,
-          metadata
+          { metadata, actor }
         );
         if (isSchedulingError(group, code) && this.#actorId) {
           const schedulingError = await checkForSchedulingError(
@@ -5098,31 +5628,8 @@ var ActorConnRaw = class {
               }
             }
           );
-          const serializedLength = messageLength(messageSerialized);
-          if (serializedLength > DEFAULT_MAX_INCOMING_MESSAGE_SIZE && message.body.tag === "ActionRequest") {
-            const actionId = Number(message.body.val.id);
-            const inFlight = this.#takeActionInFlight(actionId);
-            const error = new RivetError(
-              "message",
-              "incoming_too_long",
-              "Incoming message too long",
-              {
-                maxSize: DEFAULT_MAX_INCOMING_MESSAGE_SIZE,
-                actualSize: serializedLength
-              }
-            );
-            logger2().warn({
-              msg: "rejecting oversized connection action request",
-              actionId,
-              actionName: inFlight.name,
-              actualSize: serializedLength,
-              maxSize: DEFAULT_MAX_INCOMING_MESSAGE_SIZE
-            });
-            inFlight.reject(error);
-            this.#dispatchActorError(error);
-            return;
-          }
           this.#websocket.send(messageSerialized);
+          const serializedLength = messageLength(messageSerialized);
           logger2().trace({
             msg: "sent websocket message",
             len: serializedLength
@@ -5165,8 +5672,26 @@ var ActorConnRaw = class {
       buffer,
       CLIENT_PROTOCOL_TO_CLIENT,
       ToClientSchema,
-      // JSON: values are already the correct type
-      (msg) => msg,
+      // JSON/CBOR: normalize actor generation to the public number shape.
+      (msg) => {
+        if (msg.body.tag !== "Error" || !msg.body.val.actor) {
+          return msg;
+        }
+        return {
+          body: {
+            tag: "Error",
+            val: {
+              ...msg.body.val,
+              actor: {
+                ...msg.body.val.actor,
+                generation: Number(
+                  msg.body.val.actor.generation
+                )
+              }
+            }
+          }
+        };
+      },
       // BARE: need to decode ArrayBuffer fields back to unknown
       (msg) => {
         if (msg.body.tag === "Error") {
@@ -5182,7 +5707,14 @@ var ActorConnRaw = class {
                     msg.body.val.metadata
                   )
                 ) : null,
-                actionId: msg.body.val.actionId
+                actionId: msg.body.val.actionId,
+                actor: msg.body.val.actor ? {
+                  actorId: msg.body.val.actor.actorId,
+                  generation: Number(
+                    msg.body.val.actor.generation
+                  ),
+                  key: msg.body.val.actor.key ?? void 0
+                } : void 0
               }
             }
           };
@@ -5376,13 +5908,11 @@ async function rawHttpFetch(driver, target, params, input, init, options = {}) {
     });
     return driver.sendRequest(target, proxyRequest, options);
   } catch (err) {
-    const { group, code, message, metadata } = deconstructError(
+    const { group, code, message, metadata, actor } = deconstructError(
       err,
-      logger2(),
-      {},
       true
     );
-    throw new RivetError(group, code, message, metadata);
+    throw new RivetError(group, code, message, { metadata, actor });
   }
 }
 async function rawWebSocket(driver, target, params, path, _protocols, options = {}) {
@@ -5418,6 +5948,47 @@ async function rawWebSocket(driver, target, params, path, _protocols, options =
   return ws;
 }
 
+// src/client/resolve-gateway-target.ts
+async function resolveGatewayTarget(driver, target) {
+  if ("directId" in target) {
+    return target.directId;
+  }
+  if ("getForId" in target) {
+    return target.getForId.actorId;
+  }
+  if ("getForKey" in target) {
+    const output = await driver.getWithKey({
+      name: target.getForKey.name,
+      key: target.getForKey.key
+    });
+    if (!output) {
+      throw actorNotFound(
+        `${target.getForKey.name}:${JSON.stringify(target.getForKey.key)}`
+      );
+    }
+    return output.actorId;
+  }
+  if ("getOrCreateForKey" in target) {
+    const output = await driver.getOrCreateWithKey({
+      name: target.getOrCreateForKey.name,
+      key: target.getOrCreateForKey.key,
+      input: target.getOrCreateForKey.input,
+      region: target.getOrCreateForKey.region
+    });
+    return output.actorId;
+  }
+  if ("create" in target) {
+    const output = await driver.createActor({
+      name: target.create.name,
+      key: target.create.key,
+      input: target.create.input,
+      region: target.create.region
+    });
+    return output.actorId;
+  }
+  throw invalidRequest("Invalid query format");
+}
+
 // src/client/actor-handle.ts
 var ActorHandleRaw = class {
   #client;
@@ -5462,7 +6033,13 @@ var ActorHandleRaw = class {
       for (let attempt = 0; attempt < maxAttempts; attempt++) {
         let actorId;
         try {
-          const target = await this.#resolveActionTarget(useQueryTarget);
+          const gatewayOptions = resolveActorGatewayOptions(
+            this.#gatewayOptions
+          );
+          const target = await this.#resolveGatewayRequestTarget(
+            useQueryTarget,
+            gatewayOptions
+          );
           actorId = "directId" in target ? target.directId : void 0;
           return await createQueueSender({
             encoding: this.#encoding,
@@ -5471,17 +6048,13 @@ var ActorHandleRaw = class {
               return await this.#driver.sendRequest(
                 target,
                 request,
-                resolveActorGatewayOptions(
-                  this.#gatewayOptions
-                )
+                gatewayOptions
               );
             }
           }).send(name, body, options);
         } catch (err) {
-          const { group, code, message, metadata } = deconstructError(
+          const { group, code, message, metadata, actor } = deconstructError(
             err,
-            logger2(),
-            {},
             true
           );
           if (this.#shouldRetryQueueDispatchOverload(
@@ -5524,7 +6097,7 @@ var ActorHandleRaw = class {
             }
             continue;
           }
-          throw new RivetError(group, code, message, metadata);
+          throw new RivetError(group, code, message, { metadata, actor });
         }
       }
       throw new Error("unreachable queue retry state");
@@ -5559,7 +6132,10 @@ var ActorHandleRaw = class {
     for (let attempt = 0; attempt < maxAttempts; attempt++) {
       let actorId;
       try {
-        const target = await this.#resolveActionTarget(useQueryTarget);
+        const target = await this.#resolveGatewayRequestTarget(
+          useQueryTarget,
+          gatewayOptions
+        );
         actorId = "directId" in target ? target.directId : void 0;
         logger2().debug(
           actorId ? { msg: "using direct actor gateway target", actorId } : {
@@ -5604,17 +6180,15 @@ var ActorHandleRaw = class {
             args: bufferToArrayBuffer(encodeCborCompat(args))
           }),
           responseFromJson: (json) => json.output,
-          responseFromBare: (bare4) => decodeCborCompat(new Uint8Array(bare4.output))
+          responseFromBare: (bare5) => decodeCborCompat(new Uint8Array(bare5.output))
         });
         if (opts.name === "destroy" && actorId) {
           await this.#waitForDestroyActionToSettle(actorId);
         }
         return output;
       } catch (err) {
-        const { group, code, message, metadata } = deconstructError(
+        const { group, code, message, metadata, actor } = deconstructError(
           err,
-          logger2(),
-          {},
           true
         );
         if (await this.#shouldRetrySchedulingError(
@@ -5644,7 +6218,7 @@ var ActorHandleRaw = class {
             "actor",
             "not_found",
             "The actor does not exist or was destroyed.",
-            metadata
+            { metadata, actor }
           );
         }
         const invalidated = this.#invalidateResolvedActorId(group, code);
@@ -5655,7 +6229,7 @@ var ActorHandleRaw = class {
           }
           continue;
         }
-        throw new RivetError(group, code, message, metadata);
+        throw new RivetError(group, code, message, { metadata, actor });
       }
     }
     throw new Error("unreachable action retry state");
@@ -5748,6 +6322,12 @@ var ActorHandleRaw = class {
       this.#resolvingActorId = void 0;
     }
   }
+  async #resolveGatewayRequestTarget(useQueryTarget, gatewayOptions) {
+    if (gatewayOptions.skipReadyWait) {
+      return getGatewayTarget(this.#actorResolutionState);
+    }
+    return await this.#resolveActionTarget(useQueryTarget);
+  }
   /**
    * Establishes a persistent connection to the actor.
    *
@@ -5794,7 +6374,10 @@ var ActorHandleRaw = class {
     for (let attempt = 0; attempt < maxAttempts; attempt++) {
       let actorId;
       try {
-        const target = await this.#resolveActionTarget(useQueryTarget);
+        const target = await this.#resolveGatewayRequestTarget(
+          useQueryTarget,
+          gatewayOptions
+        );
         actorId = "directId" in target ? target.directId : void 0;
         const response = await rawHttpFetch(
           this.#driver,
@@ -5819,10 +6402,8 @@ var ActorHandleRaw = class {
         }
         return response;
       } catch (err) {
-        const { group, code, message, metadata } = deconstructError(
+        const { group, code, message, metadata, actor } = deconstructError(
           err,
-          logger2(),
-          {},
           true
         );
         if (await this.#shouldRetrySchedulingError(
@@ -5855,7 +6436,7 @@ var ActorHandleRaw = class {
           }
           continue;
         }
-        throw new RivetError(group, code, message, metadata);
+        throw new RivetError(group, code, message, { metadata, actor });
       }
     }
     throw new Error("unreachable fetch retry state");
@@ -5915,12 +6496,23 @@ var ActorHandleRaw = class {
         new Uint8Array(await response.clone().arrayBuffer()),
         HTTP_RESPONSE_ERROR_VERSIONED,
         HttpResponseErrorSchema,
-        (json) => json,
-        (bare4) => ({
-          group: bare4.group,
-          code: bare4.code,
-          message: bare4.message,
-          metadata: bare4.metadata ? decodeCborCompat(new Uint8Array(bare4.metadata)) : void 0
+        (json) => ({
+          ...json,
+          actor: json.actor ? {
+            ...json.actor,
+            generation: Number(json.actor.generation)
+          } : void 0
+        }),
+        (bare5) => ({
+          group: bare5.group,
+          code: bare5.code,
+          message: bare5.message,
+          metadata: bare5.metadata ? decodeCborCompat(new Uint8Array(bare5.metadata)) : void 0,
+          actor: bare5.actor ? {
+            actorId: bare5.actor.actorId,
+            generation: Number(bare5.actor.generation),
+            key: bare5.actor.key ?? void 0
+          } : void 0
         })
       );
     } catch {
@@ -5936,7 +6528,10 @@ var ActorHandleRaw = class {
       this.#gatewayOptions,
       options
     );
-    const target = gatewayOptions.skipReadyWait ? await this.#resolveActionTarget(false) : getGatewayTarget(this.#actorResolutionState);
+    const target = await this.#resolveGatewayRequestTarget(
+      false,
+      gatewayOptions
+    );
     return await rawWebSocket(
       this.#driver,
       target,