@rivetkit/supabase 2.3.23 → 2.3.24-rc.1

package/dist/mod.js

@@ -538,7 +538,7 @@ function unsupportedFeature(feature) {
   );
 }
 
-// ../rivetkit/dist/tsup/chunk-674WU4L6.js
+// ../rivetkit/dist/tsup/chunk-JJCUSUWO.js
 var import_pino = require("pino");
 
 // ../../../node_modules/.pnpm/zod@4.1.13/node_modules/zod/v4/classic/external.js
@@ -13211,7 +13211,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-674WU4L6.js
+// ../rivetkit/dist/tsup/chunk-JJCUSUWO.js
 var cbor = __toESM(require("cbor-x"), 1);
 var import_invariant = __toESM(require_invariant(), 1);
 var getRivetEngine = () => getEnvUniversal("RIVET_ENGINE");
@@ -13382,7 +13382,7 @@ function noopNext() {
 }
 var package_default = {
   name: "rivetkit",
-  version: "2.3.23",
+  version: "2.3.24-rc.1",
   description: "Lightweight libraries for building stateful actors on edge platforms",
   license: "Apache-2.0",
   keywords: [
@@ -14689,7 +14689,7 @@ function Config({ initialBufferLength = 1024, maxBufferLength = 1024 * 1024 * 32
   };
 }
 
-// ../rivetkit/dist/tsup/chunk-Z3Z5EOSP.js
+// ../rivetkit/dist/tsup/chunk-M5J3PXNU.js
 var config2 = /* @__PURE__ */ Config({});
 function readWorkflowCbor(bc) {
   return readData(bc);
@@ -14987,7 +14987,7 @@ function decodeWorkflowHistoryTransport(data) {
   return decodeWorkflowHistory(toUint8Array(data));
 }
 
-// ../rivetkit/dist/tsup/chunk-CSOHAAZK.js
+// ../rivetkit/dist/tsup/chunk-LTGBHN5Z.js
 function flattenActionHandlers(actions) {
   const flattened = /* @__PURE__ */ Object.create(null);
   for (const { name, handler } of collectActionEntries(actions)) {
@@ -15682,7 +15682,7 @@ var AsyncMutex = class {
   }
 };
 
-// ../rivetkit/dist/tsup/chunk-KC3T3MMB.js
+// ../rivetkit/dist/tsup/chunk-OB5JLDBM.js
 function logger() {
   return getLogger("actor-client");
 }
@@ -15720,7 +15720,7 @@ async function importWebSocket() {
   return webSocketPromise;
 }
 
-// ../rivetkit/dist/tsup/chunk-LKNGMRIT.js
+// ../rivetkit/dist/tsup/chunk-B6WTPGOR.js
 var import_invariant2 = __toESM(require_invariant(), 1);
 
 // ../../../node_modules/.pnpm/p-retry@6.2.1/node_modules/p-retry/index.js
@@ -16935,7 +16935,7 @@ var TraceAPI = (
 // ../../../node_modules/.pnpm/@opentelemetry+api@1.9.0/node_modules/@opentelemetry/api/build/esm/trace-api.js
 var trace = TraceAPI.getInstance();
 
-// ../rivetkit/dist/tsup/chunk-LKNGMRIT.js
+// ../rivetkit/dist/tsup/chunk-B6WTPGOR.js
 var import_invariant3 = __toESM(require_invariant(), 1);
 var import_invariant4 = __toESM(require_invariant(), 1);
 var PATH_CONNECT = "/connect";
@@ -23112,7 +23112,7 @@ function apiActorToOutput(actor2) {
   };
 }
 
-// ../rivetkit/dist/tsup/chunk-HO6UA2RJ.js
+// ../rivetkit/dist/tsup/chunk-QQ454DVR.js
 var nativeStateTransactionOpeners = /* @__PURE__ */ new WeakMap();
 var nativeStateTransactionClientBinders = /* @__PURE__ */ new WeakMap();
 function registerNativeStateTransactionOpener(provider, opener) {
@@ -26171,6 +26171,12 @@ var NapiCoreRuntime = class {
   actorId(ctx) {
     return asNativeActorContext(ctx).actorId();
   }
+  actorGeneration(ctx) {
+    return asNativeActorContext(ctx).generation() ?? void 0;
+  }
+  actorIsLost(ctx) {
+    return asNativeActorContext(ctx).isLost();
+  }
   runWithActorInvocationContext(ctx, run) {
     return this.#runAs(asNativeActorContext(ctx), run);
   }
@@ -26784,6 +26790,27 @@ function notifyStateChanged(state) {
     waiter();
   }
 }
+function createRunState(actorGeneration) {
+  return {
+    actorGeneration,
+    active: false,
+    closed: false,
+    exclusive: false,
+    exclusiveGeneration: 0,
+    inspectorInitialized: false,
+    queued: 0,
+    waiters: /* @__PURE__ */ new Set()
+  };
+}
+function closeRunState(state, disposeInspector = true) {
+  var _a2, _b;
+  state.closed = true;
+  if (disposeInspector) {
+    (_b = (_a2 = state.inspector) == null ? void 0 : _a2.dispose) == null ? void 0 : _b.call(_a2);
+  }
+  state.inspector = void 0;
+  notifyStateChanged(state);
+}
 function waitForStateChange(state) {
   return new Promise((resolve) => {
     state.waiters.add(resolve);
@@ -26798,8 +26825,11 @@ var RunHandlerCoordinator = class {
   get inspectorKind() {
     return getRunInspectorKind(this.#run);
   }
-  async run(actorId, restart, callback) {
-    const state = this.#getOrCreate(actorId);
+  async run(actorId, restart, callback, actorGeneration) {
+    const state = this.#getOrCreate(actorId, actorGeneration);
+    if (state.closed) {
+      return "closed";
+    }
     state.restart = restart;
     this.#initializeInspector(actorId, state);
     state.queued += 1;
@@ -26826,21 +26856,27 @@ var RunHandlerCoordinator = class {
       notifyStateChanged(state);
     }
   }
-  getInspector(actorId, restart) {
+  getInspector(actorId, restart, actorGeneration) {
     var _a2;
-    const state = this.#getOrCreate(actorId);
+    const state = this.#getOrCreate(actorId, actorGeneration);
+    if (state.closed) {
+      return void 0;
+    }
     state.restart = restart;
     this.#initializeInspector(actorId, state);
     return (_a2 = state.inspector) == null ? void 0 : _a2.inspector;
   }
-  destroy(actorId) {
-    var _a2, _b;
+  /**
+   * Closes the run state for `actorId`. With `actorGeneration`, only state owned by that
+   * generation is closed, so an older generation's late cleanup cannot close a newer one.
+   */
+  destroy(actorId, actorGeneration, options = {}) {
     const state = this.#states.get(actorId);
     if (!state) return;
-    state.closed = true;
-    (_b = (_a2 = state.inspector) == null ? void 0 : _a2.dispose) == null ? void 0 : _b.call(_a2);
-    state.inspector = void 0;
-    notifyStateChanged(state);
+    if (actorGeneration !== void 0 && state.actorGeneration !== void 0 && state.actorGeneration !== actorGeneration) {
+      return;
+    }
+    closeRunState(state, options.disposeInspector ?? true);
     this.#states.delete(actorId);
   }
   #control(actorId, state) {
@@ -26886,18 +26922,20 @@ var RunHandlerCoordinator = class {
       }
     };
   }
-  #getOrCreate(actorId) {
+  #getOrCreate(actorId, actorGeneration) {
     let state = this.#states.get(actorId);
+    if (state && actorGeneration !== void 0 && state.actorGeneration !== void 0 && state.actorGeneration !== actorGeneration) {
+      if (actorGeneration < state.actorGeneration) {
+        const detached = createRunState(actorGeneration);
+        detached.closed = true;
+        return detached;
+      }
+      closeRunState(state, false);
+      this.#states.delete(actorId);
+      state = void 0;
+    }
     if (!state) {
-      state = {
-        active: false,
-        closed: false,
-        exclusive: false,
-        exclusiveGeneration: 0,
-        inspectorInitialized: false,
-        queued: 0,
-        waiters: /* @__PURE__ */ new Set()
-      };
+      state = createRunState(actorGeneration);
       this.#states.set(actorId, state);
     }
     return state;
@@ -26906,6 +26944,7 @@ var RunHandlerCoordinator = class {
     if (state.inspectorInitialized) return;
     const inspector = createRunInspector(this.#run, {
       actorId,
+      actorGeneration: state.actorGeneration,
       control: this.#control(actorId, state)
     });
     if (this.inspectorKind === "workflow") {
@@ -27231,6 +27270,12 @@ var WasmCoreRuntime = class {
   actorId(ctx) {
     return callHandle(asWasmActorContext(ctx), "actorId");
   }
+  actorGeneration(ctx) {
+    return callHandle(asWasmActorContext(ctx), "generation") ?? void 0;
+  }
+  actorIsLost(ctx) {
+    return callHandle(asWasmActorContext(ctx), "isLost");
+  }
   runWithActorInvocationContext(_ctx, run) {
     return run();
   }
@@ -28057,8 +28102,11 @@ async function cleanupNativeSleepRuntimeState(runtime, ctx, afterTrackedWorkDrai
     await closeNativeDatabaseClient(runtime, ctx);
     await closeNativeSqlDatabase(runtime, ctx);
     void runtime.actorWaitForTrackedShutdownWorkUnbounded(ctx).then(async () => {
-      await (afterTrackedWorkDrained == null ? void 0 : afterTrackedWorkDrained());
-      clearNativeRuntimeState(runtime, ctx);
+      try {
+        await (afterTrackedWorkDrained == null ? void 0 : afterTrackedWorkDrained());
+      } finally {
+        clearNativeRuntimeState(runtime, ctx);
+      }
     }).catch((error46) => {
       logger22().warn({
         msg: "deferred native sleep cleanup failed",
@@ -28067,10 +28115,24 @@ async function cleanupNativeSleepRuntimeState(runtime, ctx, afterTrackedWorkDrai
     });
     return;
   }
-  await (afterTrackedWorkDrained == null ? void 0 : afterTrackedWorkDrained());
+  try {
+    await (afterTrackedWorkDrained == null ? void 0 : afterTrackedWorkDrained());
+  } finally {
+    try {
+      await closeNativeDatabaseClient(runtime, ctx);
+      await closeNativeSqlDatabase(runtime, ctx);
+    } finally {
+      clearNativeRuntimeState(runtime, ctx);
+    }
+  }
+}
+async function cleanupNativeLostRuntimeState(runtime, ctx) {
   await closeNativeDatabaseClient(runtime, ctx);
-  await closeNativeSqlDatabase(runtime, ctx);
-  clearNativeRuntimeState(runtime, ctx);
+  try {
+    await closeNativeSqlDatabase(runtime, ctx);
+  } finally {
+    clearNativeRuntimeState(runtime, ctx);
+  }
 }
 function closeNativeSqlDatabase(runtime, ctx) {
   const runtimeState = getNativeRuntimeState(runtime, ctx);
@@ -28088,6 +28150,9 @@ async function closeNativeDatabaseClient(runtime, ctx) {
     return;
   }
   runtimeState.databaseClient = void 0;
+  if (callNativeSync(() => runtime.actorIsLost(ctx))) {
+    return;
+  }
   if (entry.client && typeof entry.client === "object" && "close" in entry.client && typeof entry.client.close === "function") {
     await entry.client.close();
   }
@@ -28513,6 +28578,49 @@ function wrapNativeCallback(callback) {
     }
   };
 }
+var LOST_GENERATION_CLEANUP_CALLBACKS = /* @__PURE__ */ new Set(["onSleep", "onDestroy"]);
+function throwIfActorLost(runtime, ctx) {
+  if (callNativeSync(() => runtime.actorIsLost(ctx))) {
+    throw actorGenerationLostError();
+  }
+}
+function actorGenerationLostError() {
+  return new RivetError(
+    "actor",
+    "stopping",
+    "Actor generation was declared lost; it starts no new user callbacks."
+  );
+}
+function refuseCallbacksAfterLost(runtime, callbacks) {
+  const guard = (callback) => {
+    return async (...args) => {
+      var _a2;
+      const ctx = (_a2 = args[1]) == null ? void 0 : _a2.ctx;
+      if (ctx !== void 0 && callNativeSync(() => runtime.actorIsLost(ctx))) {
+        throw encodeNativeCallbackError(actorGenerationLostError());
+      }
+      return await callback(...args);
+    };
+  };
+  const guarded = {};
+  for (const [name, value] of Object.entries(callbacks)) {
+    if (LOST_GENERATION_CLEANUP_CALLBACKS.has(name)) {
+      guarded[name] = value;
+    } else if (typeof value === "function") {
+      guarded[name] = guard(value);
+    } else if (name === "actions" && value !== null && typeof value === "object") {
+      guarded[name] = Object.fromEntries(
+        Object.entries(value).map(([actionName, handler]) => [
+          actionName,
+          guard(handler)
+        ])
+      );
+    } else {
+      guarded[name] = value;
+    }
+  }
+  return guarded;
+}
 function decodeArgs(value) {
   const decoded = decodeValue(value);
   return normalizeArgs(decoded);
@@ -28950,17 +29058,30 @@ var NativeQueueAdapter = class {
     this.#ctx = ctx;
     this.#schemas = schemas;
   }
+  // Queue results arrive after awaits, and their schema validation is user code, so each
+  // validation checks that the generation was not lost first.
+  #validateBody(name, body) {
+    throwIfActorLost(this.#runtime, this.#ctx);
+    return validateQueueBody(this.#schemas, name, body);
+  }
+  #validateComplete(name, response) {
+    throwIfActorLost(this.#runtime, this.#ctx);
+    return validateQueueComplete(this.#schemas, name, response);
+  }
+  #wrap(message) {
+    throwIfActorLost(this.#runtime, this.#ctx);
+    return wrapQueueMessage(message, this.#schemas);
+  }
   async send(name, body) {
-    const validatedBody = validateQueueBody(this.#schemas, name, body);
-    return wrapQueueMessage(
+    const validatedBody = this.#validateBody(name, body);
+    return this.#wrap(
       await callNative(
         () => this.#runtime.actorQueueSend(
           this.#ctx,
           name,
           encodeValue(validatedBody)
         )
-      ),
-      this.#schemas
+      )
     );
   }
   async next(options) {
@@ -29003,9 +29124,7 @@ var NativeQueueAdapter = class {
           token
         )
       );
-      const wrapped = messages.map(
-        (message) => wrapQueueMessage(message, this.#schemas)
-      );
+      const wrapped = messages.map((message) => this.#wrap(message));
       return completable ? wrapped.map(
         (message) => this.#makeCompletableMessage(message)
       ) : wrapped;
@@ -29019,7 +29138,7 @@ var NativeQueueAdapter = class {
       options == null ? void 0 : options.signal
     );
     try {
-      return wrapQueueMessage(
+      return this.#wrap(
         await callNative(
           () => this.#runtime.actorQueueWaitForNames(
             this.#ctx,
@@ -29030,8 +29149,7 @@ var NativeQueueAdapter = class {
             },
             token
           )
-        ),
-        this.#schemas
+        )
       );
     } finally {
       cleanup == null ? void 0 : cleanup();
@@ -29061,8 +29179,7 @@ var NativeQueueAdapter = class {
     await this.waitForNamesAvailable(names ?? [], options);
   }
   async complete(message, response) {
-    const validatedResponse = validateQueueComplete(
-      this.#schemas,
+    const validatedResponse = this.#validateComplete(
       message.name,
       response
     );
@@ -29077,7 +29194,7 @@ var NativeQueueAdapter = class {
     this.#pendingCompletableMessageIds.delete(message.id.toString());
   }
   async enqueueAndWait(name, body, options) {
-    const validatedBody = validateQueueBody(this.#schemas, name, body);
+    const validatedBody = this.#validateBody(name, body);
     const { token, cleanup } = await createCancellationTokenHandle(
       this.#runtime,
       options == null ? void 0 : options.signal
@@ -29094,11 +29211,7 @@ var NativeQueueAdapter = class {
           token
         )
       );
-      return response === void 0 || response === null ? void 0 : validateQueueComplete(
-        this.#schemas,
-        name,
-        decodeValue(response)
-      );
+      return response === void 0 || response === null ? void 0 : this.#validateComplete(name, decodeValue(response));
     } finally {
       cleanup == null ? void 0 : cleanup();
     }
@@ -29479,6 +29592,9 @@ var TrackedWebSocketHandleAdapter = class {
     }
   }
   #callHandler(type, handler, event2) {
+    if ((type === "message" || type === "open") && this.#ctx.isLost) {
+      return;
+    }
     try {
       const result = handler(event2);
       if (!this.#isPromiseLike(result)) {
@@ -29761,6 +29877,13 @@ var ActorContextHandleAdapter = class {
   get actorId() {
     return callNativeSync(() => this.#runtime.actorId(this.#ctx));
   }
+  get actorGeneration() {
+    return callNativeSync(() => this.#runtime.actorGeneration(this.#ctx));
+  }
+  /** Whether this generation was declared lost. A lost generation starts no new user code. */
+  get isLost() {
+    return callNativeSync(() => this.#runtime.actorIsLost(this.#ctx));
+  }
   get name() {
     return callNativeSync(() => this.#runtime.actorName(this.#ctx));
   }
@@ -29875,6 +29998,9 @@ var ActorContextHandleAdapter = class {
       return this.#db;
     }
     const actorId = this.actorId;
+    if (this.isLost) {
+      throw actorGenerationLostError();
+    }
     const createdClient = await this.#databaseProvider.createClient({
       actorId,
       kv: {
@@ -30027,9 +30153,11 @@ var ActorContextHandleAdapter = class {
     if (!this.#databaseProvider) {
       return;
     }
-    await this.#databaseProvider.onMigrate(
-      await this.ensureDatabaseClient()
-    );
+    const client = await this.ensureDatabaseClient();
+    if (this.isLost) {
+      throw actorGenerationLostError();
+    }
+    await this.#databaseProvider.onMigrate(client);
   }
   async closeDatabase() {
     this.#db = void 0;
@@ -30301,7 +30429,7 @@ var ActorContextHandleAdapter = class {
     callNativeSync(
       () => this.#runtime.actorRequestSave(this.#ctx, { immediate: false })
     );
-    if (!this.#onStateChange) {
+    if (!this.#onStateChange || this.isLost) {
       return;
     }
     actorState.isInOnStateChange = true;
@@ -30341,6 +30469,12 @@ var NativeWorkflowRuntimeAdapter = class {
   #onMessagesReceived;
   #completions = /* @__PURE__ */ new Map();
   id;
+  /** Actor generation, used to keep workflow registrations of different generations apart. */
+  generation;
+  /** Whether this generation was declared lost. Workflow code checks it before each user callback. */
+  get isLost() {
+    return this.#ctx.isLost;
+  }
   driver;
   queueManager;
   stateManager;
@@ -30348,6 +30482,7 @@ var NativeWorkflowRuntimeAdapter = class {
     this.#ctx = ctx;
     this.#onMessagesReceived = onMessagesReceived;
     this.id = ctx.actorId;
+    this.generation = ctx.actorGeneration;
     this.driver = {
       kvBatchGet: async (actorId, keys) => {
         this.#assertActorId(actorId);
@@ -30630,9 +30765,23 @@ function buildNativeFactory(runtime, registryConfig, definition) {
   const runHandlerCoordinator = getRunInspectorKind(config3.run) === "workflow" ? new RunHandlerCoordinator(config3.run) : void 0;
   const getNativeWorkflowInspector = (ctx) => {
     var _a22, _b;
+    if (callNativeSync(() => runtime.actorIsLost(ctx))) {
+      return void 0;
+    }
     const actorId = callNativeSync(() => runtime.actorId(ctx));
     const restart = () => callNativeSync(() => runtime.actorRestartRunHandler(ctx));
-    return ((_a22 = runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.getInspector(actorId, restart)) == null ? void 0 : _a22.workflow) ?? ((_b = getRunInspectorConfig(config3.run, actorId)) == null ? void 0 : _b.workflow);
+    const actorGeneration = callNativeSync(
+      () => runtime.actorGeneration(ctx)
+    );
+    const inspector = ((_a22 = runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.getInspector(
+      actorId,
+      restart,
+      actorGeneration
+    )) == null ? void 0 : _a22.workflow) ?? ((_b = getRunInspectorConfig(config3.run, actorId)) == null ? void 0 : _b.workflow);
+    if (callNativeSync(() => runtime.actorIsLost(ctx))) {
+      return void 0;
+    }
+    return inspector;
   };
   const onStateChange = typeof config3.onStateChange === "function" ? (actorCtx, nextState) => {
     config3.onStateChange(actorCtx, nextState);
@@ -30709,6 +30858,10 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         return errorResponse(error46, 401);
       }
     }
+    const inspectorConnParams = (conn) => {
+      throwIfActorLost(runtime, ctx);
+      return conn.params;
+    };
     const workflowHistory = () => {
       var _a3;
       return serializeWorkflowHistoryForJson(
@@ -30742,7 +30895,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
               id: conn.id,
               details: {
                 type: null,
-                params: conn.params,
+                params: inspectorConnParams(conn),
                 stateEnabled: true,
                 state: conn.state,
                 subscriptions: 0,
@@ -30946,7 +31099,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
               id: conn.id,
               details: {
                 type: null,
-                params: conn.params,
+                params: inspectorConnParams(conn),
                 stateEnabled: true,
                 state: conn.state,
                 subscriptions: 0,
@@ -30993,15 +31146,20 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           );
         }
         const args = body.properties !== void 0 ? [body.properties] : normalizeArgs(body.args);
+        if (callNativeSync(() => runtime.actorIsLost(ctx))) {
+          return jsonResponse(
+            { error: "actor generation was declared lost" },
+            { status: 503 }
+          );
+        }
         try {
-          const output = await action(
-            actorCtx,
-            ...validateActionArgs(
-              schemaConfig.actionInputSchemas,
-              actionName,
-              args
-            )
+          const validatedArgs = validateActionArgs(
+            schemaConfig.actionInputSchemas,
+            actionName,
+            args
           );
+          throwIfActorLost(runtime, ctx);
+          const output = await action(actorCtx, ...validatedArgs);
           return jsonResponse({ output });
         } catch (error46) {
           logger22().error({
@@ -31105,7 +31263,9 @@ function buildNativeFactory(runtime, registryConfig, definition) {
             await actorCtx.closeDatabase();
           }
           await actorCtx.runDatabaseMigrations();
-          if (typeof config3.onMigrate === "function") {
+          if (typeof config3.onMigrate === "function" && !callNativeSync(
+            () => runtime.actorIsLost(ctx)
+          )) {
             await config3.onMigrate(actorCtx, isNew);
           }
         } catch (error210) {
@@ -31148,7 +31308,29 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         const { ctx } = unwrapTsfnPayload(error46, payload);
         const actorCtx = makeActorCtx(ctx);
         const actorId = callNativeSync(() => runtime.actorId(ctx));
+        const actorGeneration = callNativeSync(
+          () => runtime.actorGeneration(ctx)
+        );
+        const isLost = () => callNativeSync(() => runtime.actorIsLost(ctx));
+        if (isLost()) {
+          try {
+            await cleanupNativeLostRuntimeState(runtime, ctx);
+          } finally {
+            runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.destroy(
+              actorId,
+              actorGeneration,
+              {
+                disposeInspector: false
+              }
+            );
+            await actorCtx.dispose();
+          }
+          return;
+        }
         const saveActorState = async () => {
+          if (isLost()) {
+            return;
+          }
           if (runtime.kind === "wasm") {
             await runtime.actorSaveState(
               ctx,
@@ -31167,14 +31349,26 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           await saveActorState();
         } finally {
           try {
-            await cleanupNativeSleepRuntimeState(
-              runtime,
-              ctx,
-              saveActorState
-            );
+            if (isLost()) {
+              await cleanupNativeLostRuntimeState(runtime, ctx);
+            } else {
+              await cleanupNativeSleepRuntimeState(
+                runtime,
+                ctx,
+                saveActorState
+              );
+            }
           } finally {
-            runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.destroy(actorId);
-            disposeRunInspector(config3.run, actorId);
+            runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.destroy(
+              actorId,
+              actorGeneration,
+              {
+                disposeInspector: !isLost()
+              }
+            );
+            if (!isLost()) {
+              disposeRunInspector(config3.run, actorId);
+            }
             await actorCtx.dispose();
           }
         }
@@ -31185,10 +31379,17 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         const { ctx } = unwrapTsfnPayload(error46, payload);
         const actorCtx = makeActorCtx(ctx);
         const actorId = callNativeSync(() => runtime.actorId(ctx));
-        runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.destroy(actorId);
-        disposeRunInspector(config3.run, actorId);
+        const isLost = () => callNativeSync(() => runtime.actorIsLost(ctx));
+        runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.destroy(
+          actorId,
+          callNativeSync(() => runtime.actorGeneration(ctx)),
+          { disposeInspector: !isLost() }
+        );
+        if (!isLost()) {
+          disposeRunInspector(config3.run, actorId);
+        }
         try {
-          if (typeof config3.onDestroy === "function") {
+          if (typeof config3.onDestroy === "function" && !isLost()) {
             await config3.onDestroy(actorCtx);
           }
         } finally {
@@ -31210,12 +31411,14 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           request ? buildNativeHttpRequest(request) : void 0
         );
         try {
+          const validatedParams = validateConnParams(
+            schemaConfig.connParamsSchema,
+            decodeValue(params)
+          );
+          throwIfActorLost(runtime, ctx);
           await config3.onBeforeConnect(
             actorCtx,
-            validateConnParams(
-              schemaConfig.connParamsSchema,
-              decodeValue(params)
-            )
+            validatedParams
           );
         } finally {
           await actorCtx.dispose();
@@ -31243,13 +31446,22 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           () => actorCtx.assertCanMutateState()
         );
         try {
-          const nextConnState = hasStaticConnState ? structuredClone(config3.connState) : await config3.createConnState(
-            actorCtx,
-            validateConnParams(
+          let nextConnState;
+          if (hasStaticConnState) {
+            nextConnState = structuredClone(
+              config3.connState
+            );
+          } else {
+            const validatedParams = validateConnParams(
               schemaConfig.connParamsSchema,
               decodeValue(params)
-            )
-          );
+            );
+            throwIfActorLost(runtime, ctx);
+            nextConnState = await config3.createConnState(
+              actorCtx,
+              validatedParams
+            );
+          }
           connAdapter.initializeState(nextConnState);
           return encodeValue(nextConnState);
         } finally {
@@ -31354,6 +31566,9 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     onBeforeActionResponse: typeof config3.onBeforeActionResponse === "function" ? wrapNativeCallback(
       async (error46, payload) => {
         const { ctx, name, args, output } = unwrapTsfnPayload(error46, payload);
+        if (callNativeSync(() => runtime.actorIsLost(ctx))) {
+          return output;
+        }
         const actorCtx = makeActorCtx(ctx);
         try {
           return encodeValue(
@@ -31422,6 +31637,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
                 }
               };
               try {
+                throwIfActorLost(runtime, ctx);
                 const connParams = validateConnParams(
                   schemaConfig.connParamsSchema,
                   rawConnParams ? JSON.parse(rawConnParams) : void 0
@@ -31456,6 +31672,11 @@ function buildNativeFactory(runtime, registryConfig, definition) {
                     abortRequest
                   );
                 }
+                if (callNativeSync(
+                  () => runtime.actorIsLost(ctx)
+                )) {
+                  throw actorGenerationLostError();
+                }
                 const response = await config3.onRequest(
                   requestCtx,
                   handlerRequest
@@ -31528,6 +31749,9 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           const { ctx } = unwrapTsfnPayload(error46, payload);
           const actorId = callNativeSync(() => runtime.actorId(ctx));
           const executeRun = async () => {
+            if (callNativeSync(() => runtime.actorIsLost(ctx))) {
+              return;
+            }
             const actorCtx = makeActorCtx(ctx);
             try {
               await run(actorCtx);
@@ -31541,7 +31765,8 @@ function buildNativeFactory(runtime, registryConfig, definition) {
               () => callNativeSync(
                 () => runtime.actorRestartRunHandler(ctx)
               ),
-              executeRun
+              executeRun,
+              callNativeSync(() => runtime.actorGeneration(ctx))
             );
             return outcome !== "suppressed";
           }
@@ -31581,14 +31806,16 @@ function buildNativeFactory(runtime, registryConfig, definition) {
             const actorCtx = conn != null ? makeConnCtx(ctx, conn, void 0, cancelToken) : makeActorCtx(ctx, void 0, cancelToken);
             const runAction = async () => {
               try {
+                const validatedArgs = validateActionArgs(
+                  schemaConfig.actionInputSchemas,
+                  name,
+                  decodeArgs(args)
+                );
+                throwIfActorLost(runtime, ctx);
                 return encodeValue(
                   await handler(
                     actorCtx,
-                    ...validateActionArgs(
-                      schemaConfig.actionInputSchemas,
-                      name,
-                      decodeArgs(args)
-                    ),
+                    ...validatedArgs,
                     ...scheduledFire ? [scheduledFire] : []
                   )
                 );
@@ -31644,6 +31871,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
               if (canPublish && !await canPublish(actorCtx)) {
                 throw forbiddenError();
               }
+              throwIfActorLost(runtime, ctx);
               const decodedBody = decodeValue(body);
               if (wait) {
                 try {
@@ -31687,7 +31915,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     )
   };
   return runtime.createActorFactory(
-    callbacks,
+    refuseCallbacksAfterLost(runtime, callbacks),
     buildActorConfig(definition, registryConfig, runtime.kind)
   );
 }