rivetkit 2.3.23 → 2.3.24-rc.1

package/dist/tsup/mod.js

@@ -1,6 +1,6 @@
 import {
   decodeWorkflowHistoryTransport
-} from "./chunk-Z3Z5EOSP.js";
+} from "./chunk-M5J3PXNU.js";
 import {
   ACTOR_CONTEXT_INTERNAL_SYMBOL,
   ActorConfigSchema,
@@ -17,7 +17,7 @@ import {
   getRunInspectorKind,
   getRunMetadata,
   hasRunInspectorConfig
-} from "./chunk-CSOHAAZK.js";
+} from "./chunk-LTGBHN5Z.js";
 import {
   ALLOWED_PUBLIC_HEADERS,
   ENGINE_HOST,
@@ -35,7 +35,7 @@ import {
   runWithActorInvocationSpan,
   tryParseEndpoint,
   updateRunnerConfig
-} from "./chunk-LKNGMRIT.js";
+} from "./chunk-B6WTPGOR.js";
 import {
   makePrefixedKey,
   removePrefixFromKey
@@ -44,9 +44,9 @@ import {
   bindNativeStateTransactionContext,
   db,
   registerNativeStateTransactionOpener
-} from "./chunk-HO6UA2RJ.js";
+} from "./chunk-QQ454DVR.js";
 import "./chunk-JTHHCZCZ.js";
-import "./chunk-KC3T3MMB.js";
+import "./chunk-OB5JLDBM.js";
 import {
   LogLevelSchema,
   VERSION,
@@ -80,7 +80,7 @@ import {
   parsePortEnv,
   stringifyError,
   toUint8Array
-} from "./chunk-674WU4L6.js";
+} from "./chunk-JJCUSUWO.js";
 import {
   INTERNAL_ERROR_CODE,
   RivetError,
@@ -1732,6 +1732,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);
   }
@@ -2351,6 +2357,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 _a, _b;
+  state.closed = true;
+  if (disposeInspector) {
+    (_b = (_a = state.inspector) == null ? void 0 : _a.dispose) == null ? void 0 : _b.call(_a);
+  }
+  state.inspector = void 0;
+  notifyStateChanged(state);
+}
 function waitForStateChange(state) {
   return new Promise((resolve) => {
     state.waiters.add(resolve);
@@ -2365,8 +2392,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;
@@ -2393,21 +2423,27 @@ var RunHandlerCoordinator = class {
       notifyStateChanged(state);
     }
   }
-  getInspector(actorId, restart) {
+  getInspector(actorId, restart, actorGeneration) {
     var _a;
-    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 (_a = state.inspector) == null ? void 0 : _a.inspector;
   }
-  destroy(actorId) {
-    var _a, _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 = (_a = state.inspector) == null ? void 0 : _a.dispose) == null ? void 0 : _b.call(_a);
-    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) {
@@ -2453,18 +2489,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;
@@ -2473,6 +2511,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") {
@@ -2800,6 +2839,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();
   }
@@ -3631,8 +3676,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((error) => {
       logger2().warn({
         msg: "deferred native sleep cleanup failed",
@@ -3641,10 +3689,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);
@@ -3662,6 +3724,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();
   }
@@ -4087,6 +4152,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 _a;
+      const ctx = (_a = args[1]) == null ? void 0 : _a.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);
@@ -4524,17 +4632,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) {
@@ -4577,9 +4698,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;
@@ -4593,7 +4712,7 @@ var NativeQueueAdapter = class {
       options == null ? void 0 : options.signal
     );
     try {
-      return wrapQueueMessage(
+      return this.#wrap(
         await callNative(
           () => this.#runtime.actorQueueWaitForNames(
             this.#ctx,
@@ -4604,8 +4723,7 @@ var NativeQueueAdapter = class {
             },
             token
           )
-        ),
-        this.#schemas
+        )
       );
     } finally {
       cleanup == null ? void 0 : cleanup();
@@ -4635,8 +4753,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
     );
@@ -4651,7 +4768,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
@@ -4668,11 +4785,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();
     }
@@ -5053,6 +5166,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)) {
@@ -5335,6 +5451,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));
   }
@@ -5449,6 +5572,9 @@ var ActorContextHandleAdapter = class {
       return this.#db;
     }
     const actorId = this.actorId;
+    if (this.isLost) {
+      throw actorGenerationLostError();
+    }
     const createdClient = await this.#databaseProvider.createClient({
       actorId,
       kv: {
@@ -5601,9 +5727,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;
@@ -5875,7 +6003,7 @@ var ActorContextHandleAdapter = class {
     callNativeSync(
       () => this.#runtime.actorRequestSave(this.#ctx, { immediate: false })
     );
-    if (!this.#onStateChange) {
+    if (!this.#onStateChange || this.isLost) {
       return;
     }
     actorState.isInOnStateChange = true;
@@ -5915,6 +6043,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;
@@ -5922,6 +6056,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);
@@ -6204,9 +6339,23 @@ function buildNativeFactory(runtime, registryConfig, definition) {
   const runHandlerCoordinator = getRunInspectorKind(config.run) === "workflow" ? new RunHandlerCoordinator(config.run) : void 0;
   const getNativeWorkflowInspector = (ctx) => {
     var _a2, _b;
+    if (callNativeSync(() => runtime.actorIsLost(ctx))) {
+      return void 0;
+    }
     const actorId = callNativeSync(() => runtime.actorId(ctx));
     const restart = () => callNativeSync(() => runtime.actorRestartRunHandler(ctx));
-    return ((_a2 = runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.getInspector(actorId, restart)) == null ? void 0 : _a2.workflow) ?? ((_b = getRunInspectorConfig(config.run, actorId)) == null ? void 0 : _b.workflow);
+    const actorGeneration = callNativeSync(
+      () => runtime.actorGeneration(ctx)
+    );
+    const inspector = ((_a2 = runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.getInspector(
+      actorId,
+      restart,
+      actorGeneration
+    )) == null ? void 0 : _a2.workflow) ?? ((_b = getRunInspectorConfig(config.run, actorId)) == null ? void 0 : _b.workflow);
+    if (callNativeSync(() => runtime.actorIsLost(ctx))) {
+      return void 0;
+    }
+    return inspector;
   };
   const onStateChange = typeof config.onStateChange === "function" ? (actorCtx, nextState) => {
     config.onStateChange(actorCtx, nextState);
@@ -6283,6 +6432,10 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         return errorResponse(error, 401);
       }
     }
+    const inspectorConnParams = (conn) => {
+      throwIfActorLost(runtime, ctx);
+      return conn.params;
+    };
     const workflowHistory = () => {
       var _a3;
       return serializeWorkflowHistoryForJson(
@@ -6316,7 +6469,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,
@@ -6520,7 +6673,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,
@@ -6567,15 +6720,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 (error) {
           logger2().error({
@@ -6679,7 +6837,9 @@ function buildNativeFactory(runtime, registryConfig, definition) {
             await actorCtx.closeDatabase();
           }
           await actorCtx.runDatabaseMigrations();
-          if (typeof config.onMigrate === "function") {
+          if (typeof config.onMigrate === "function" && !callNativeSync(
+            () => runtime.actorIsLost(ctx)
+          )) {
             await config.onMigrate(actorCtx, isNew);
           }
         } catch (error2) {
@@ -6722,7 +6882,29 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         const { ctx } = unwrapTsfnPayload(error, 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,
@@ -6741,14 +6923,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(config.run, actorId);
+            runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.destroy(
+              actorId,
+              actorGeneration,
+              {
+                disposeInspector: !isLost()
+              }
+            );
+            if (!isLost()) {
+              disposeRunInspector(config.run, actorId);
+            }
             await actorCtx.dispose();
           }
         }
@@ -6759,10 +6953,17 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         const { ctx } = unwrapTsfnPayload(error, payload);
         const actorCtx = makeActorCtx(ctx);
         const actorId = callNativeSync(() => runtime.actorId(ctx));
-        runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.destroy(actorId);
-        disposeRunInspector(config.run, actorId);
+        const isLost = () => callNativeSync(() => runtime.actorIsLost(ctx));
+        runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.destroy(
+          actorId,
+          callNativeSync(() => runtime.actorGeneration(ctx)),
+          { disposeInspector: !isLost() }
+        );
+        if (!isLost()) {
+          disposeRunInspector(config.run, actorId);
+        }
         try {
-          if (typeof config.onDestroy === "function") {
+          if (typeof config.onDestroy === "function" && !isLost()) {
             await config.onDestroy(actorCtx);
           }
         } finally {
@@ -6784,12 +6985,14 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           request ? buildNativeHttpRequest(request) : void 0
         );
         try {
+          const validatedParams = validateConnParams(
+            schemaConfig.connParamsSchema,
+            decodeValue(params)
+          );
+          throwIfActorLost(runtime, ctx);
           await config.onBeforeConnect(
             actorCtx,
-            validateConnParams(
-              schemaConfig.connParamsSchema,
-              decodeValue(params)
-            )
+            validatedParams
           );
         } finally {
           await actorCtx.dispose();
@@ -6817,13 +7020,22 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           () => actorCtx.assertCanMutateState()
         );
         try {
-          const nextConnState = hasStaticConnState ? structuredClone(config.connState) : await config.createConnState(
-            actorCtx,
-            validateConnParams(
+          let nextConnState;
+          if (hasStaticConnState) {
+            nextConnState = structuredClone(
+              config.connState
+            );
+          } else {
+            const validatedParams = validateConnParams(
               schemaConfig.connParamsSchema,
               decodeValue(params)
-            )
-          );
+            );
+            throwIfActorLost(runtime, ctx);
+            nextConnState = await config.createConnState(
+              actorCtx,
+              validatedParams
+            );
+          }
           connAdapter.initializeState(nextConnState);
           return encodeValue(nextConnState);
         } finally {
@@ -6928,6 +7140,9 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     onBeforeActionResponse: typeof config.onBeforeActionResponse === "function" ? wrapNativeCallback(
       async (error, payload) => {
         const { ctx, name, args, output } = unwrapTsfnPayload(error, payload);
+        if (callNativeSync(() => runtime.actorIsLost(ctx))) {
+          return output;
+        }
         const actorCtx = makeActorCtx(ctx);
         try {
           return encodeValue(
@@ -6996,6 +7211,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
                 }
               };
               try {
+                throwIfActorLost(runtime, ctx);
                 const connParams = validateConnParams(
                   schemaConfig.connParamsSchema,
                   rawConnParams ? JSON.parse(rawConnParams) : void 0
@@ -7030,6 +7246,11 @@ function buildNativeFactory(runtime, registryConfig, definition) {
                     abortRequest
                   );
                 }
+                if (callNativeSync(
+                  () => runtime.actorIsLost(ctx)
+                )) {
+                  throw actorGenerationLostError();
+                }
                 const response = await config.onRequest(
                   requestCtx,
                   handlerRequest
@@ -7102,6 +7323,9 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           const { ctx } = unwrapTsfnPayload(error, payload);
           const actorId = callNativeSync(() => runtime.actorId(ctx));
           const executeRun = async () => {
+            if (callNativeSync(() => runtime.actorIsLost(ctx))) {
+              return;
+            }
             const actorCtx = makeActorCtx(ctx);
             try {
               await run(actorCtx);
@@ -7115,7 +7339,8 @@ function buildNativeFactory(runtime, registryConfig, definition) {
               () => callNativeSync(
                 () => runtime.actorRestartRunHandler(ctx)
               ),
-              executeRun
+              executeRun,
+              callNativeSync(() => runtime.actorGeneration(ctx))
             );
             return outcome !== "suppressed";
           }
@@ -7155,14 +7380,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] : []
                   )
                 );
@@ -7218,6 +7445,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
               if (canPublish && !await canPublish(actorCtx)) {
                 throw forbiddenError();
               }
+              throwIfActorLost(runtime, ctx);
               const decodedBody = decodeValue(body);
               if (wait) {
                 try {
@@ -7261,7 +7489,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     )
   };
   return runtime.createActorFactory(
-    callbacks,
+    refuseCallbacksAfterLost(runtime, callbacks),
     buildActorConfig(definition, registryConfig, runtime.kind)
   );
 }