xstate 6.0.0-beta.1 → 6.0.0-beta.2

package/dist/xstate-durable.cjs.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var dist_xstatePersist = require('./xstate-persist.cjs.js');
-var createActor = require('./createActor-25900f76.cjs.js');
-var effectDescriptor = require('./effectDescriptor-2fa27c54.cjs.js');
-require('./machineSchemas-88d01821.cjs.js');
+var createActor = require('./createActor-c91c9ffe.cjs.js');
+var effectDescriptor = require('./effectDescriptor-47f73e7e.cjs.js');
+require('./legacySnapshot-8d595687.cjs.js');
 require('./validation-4561b43c.cjs.js');
 
 /** @experimental */
@@ -20,6 +20,36 @@ require('./validation-4561b43c.cjs.js');
  * @experimental
  */
 
+/**
+ * A root-addressed event that the execution received but has not processed,
+ * stored in a checkpoint. `source` is the sender's logical address.
+ *
+ * @experimental
+ */
+
+/**
+ * Everything needed to resume an execution: the persisted snapshot, the next
+ * transition index and the events received but not yet processed. Persist
+ * the whole object atomically and pass it to `restore()`.
+ *
+ * @experimental
+ */
+
+// Lifecycle events that address a child by `actorId`. Snapshot updates are
+// not stored: a restored child reports its current snapshot when it starts.
+const storedLifecycleEvents = new Set(['xstate.done.actor', 'xstate.error.actor', 'xstate.timeout.actor']);
+function isCheckpoint(value) {
+  return !!value && typeof value === 'object' && 'inbox' in value && 'nextTransitionIndex' in value && 'snapshot' in value;
+}
+function isInboxEntry(item) {
+  if (!item || typeof item !== 'object') return false;
+  const {
+    event,
+    source
+  } = item;
+  return !!event && typeof event.type === 'string' && (source === undefined || !!source && typeof source['@actor'] === 'string' && (source.incarnation === undefined || typeof source.incarnation === 'string'));
+}
+
 /** @experimental */
 
 /**
@@ -149,6 +179,15 @@ function createDurable(logic, adapter, options) {
   // loop to take them through `waitForEvent()`.
   const pendingRootEvents = [];
 
+  // For a stored lifecycle event: the child it addresses in `snapshot`, or
+  // `null` when that child is gone. `undefined` for any other event.
+  const lifecycleChild = (snapshot, event) => {
+    if (!createActor.isMachineSnapshot(snapshot) || !storedLifecycleEvents.has(event.type) || typeof event.actorId !== 'string') {
+      return undefined;
+    }
+    return snapshot.children[event.actorId] ?? null;
+  };
+
   // Every inter-actor edge is an async handoff to the runtime, and every
   // handoff queues behind the last one: hosts whose step or activity model
   // forbids concurrent entries depend on that, and so does deterministic
@@ -289,6 +328,16 @@ function createDurable(logic, adapter, options) {
   }
   const inspect = options?.inspect;
 
+  // Runs a transition as this execution: views it derives belong to this
+  // execution, and its systems report to the execution's inspector.
+  const owner = {
+    runtime: wrappedSystemRuntime,
+    inspect
+  };
+  function inExecution(fn) {
+    return createActor.withExecutionOwner(owner, () => createActor.withSystemInspector(inspect, fn));
+  }
+
   // Attaches the execution's inspector to a system that does not have it
   // yet. Systems constructed inside a transition get it at construction (the
   // ambient inspector); this covers systems materialized outside that window
@@ -319,10 +368,12 @@ function createDurable(logic, adapter, options) {
       const visit = actor => {
         if (!systems.has(actor.system)) {
           systems.add(actor.system);
-          if (wrappedSystemRuntime) {
-            actor.system.runtime = wrappedSystemRuntime;
+          if (createActor.adoptSystem(actor.system, owner)) {
+            if (wrappedSystemRuntime) {
+              actor.system.runtime = wrappedSystemRuntime;
+            }
+            wireInspection(actor.system);
           }
-          wireInspection(actor.system);
         }
         if (recursive) {
           const children = actor.getSnapshot().children;
@@ -354,14 +405,55 @@ function createDurable(logic, adapter, options) {
     get nextTransitionIndex() {
       return nextTransitionIndex;
     },
-    restore(persistedSnapshot) {
+    checkpoint(snapshot, persistOptions) {
+      const inbox = [];
+      for (const {
+        event,
+        source
+      } of pendingRootEvents) {
+        const child = lifecycleChild(snapshot, event);
+        if (event.type === 'xstate.snapshot.actor' || child !== undefined && (!child || event.sessionId !== undefined && child.sessionId !== undefined && child.sessionId !== event.sessionId)) {
+          continue;
+        }
+        inbox.push({
+          event,
+          source: source && {
+            '@actor': source.address,
+            ...(createActor.isRemoteActorRef(source) && source.sessionId !== undefined ? {
+              incarnation: source.sessionId
+            } : {})
+          }
+        });
+      }
+      return {
+        snapshot: logic.getPersistedSnapshot?.(snapshot, persistOptions) ?? snapshot,
+        nextTransitionIndex,
+        inbox
+      };
+    },
+    restore(checkpointOrSnapshot) {
+      const checkpoint = isCheckpoint(checkpointOrSnapshot) ? checkpointOrSnapshot : undefined;
       if (restored || nextTransitionIndex !== startingTransitionIndex || currentBatch) {
         throw new Error('restore() requires a fresh durable execution');
       }
+      if (checkpoint) {
+        if (!Array.isArray(checkpoint.inbox) || !checkpoint.inbox.every(isInboxEntry)) {
+          throw new TypeError('The checkpoint inbox is invalid.');
+        }
+        if (adapter.transitionIndex !== undefined && adapter.transitionIndex !== checkpoint.nextTransitionIndex) {
+          throw new RangeError(`The adapter's transitionIndex (${adapter.transitionIndex}) does not match the checkpoint's nextTransitionIndex (${checkpoint.nextTransitionIndex}).`);
+        }
+        if (!Number.isSafeInteger(checkpoint.nextTransitionIndex) || checkpoint.nextTransitionIndex < 0) {
+          throw new RangeError('nextTransitionIndex must be a non-negative safe integer');
+        }
+        nextTransitionIndex = checkpoint.nextTransitionIndex;
+        lastTransitionIndex = nextTransitionIndex === 0 ? undefined : nextTransitionIndex - 1;
+      }
+      const persistedSnapshot = checkpoint ? checkpoint.snapshot : checkpointOrSnapshot;
       const {
         snapshot,
         scope
-      } = createActor.withSystemInspector(inspect, () => createActor.withExecutionIdentity(executionIdentity, () => {
+      } = inExecution(() => createActor.withExecutionIdentity(executionIdentity, () => {
         const scope = createActor.createInertActorScope(logic);
         const snapshot = dist_xstatePersist.restoreLogicSnapshot(logic, persistedSnapshot, scope);
         createActor.setInertActorScopeSnapshot(scope, snapshot, false);
@@ -370,6 +462,24 @@ function createDurable(logic, adapter, options) {
           scope
         };
       }));
+      for (const {
+        event,
+        source
+      } of checkpoint?.inbox ?? []) {
+        const child = lifecycleChild(snapshot, event);
+        if (child === null) {
+          continue;
+        }
+        pendingRootEvents.push({
+          // A restored child has a new session; its pending lifecycle events
+          // follow it.
+          event: child && child.sessionId !== undefined && 'sessionId' in event ? {
+            ...event,
+            sessionId: child.sessionId
+          } : event,
+          source: source && execution.getActorRef(snapshot, source['@actor'])
+        });
+      }
       const effects = [];
       if (snapshot.status === 'active') {
         const {
@@ -399,11 +509,11 @@ function createDurable(logic, adapter, options) {
       if (restored) {
         throw new Error('initialTransition() cannot initialize a restored execution');
       }
-      const [snapshot, effects] = createActor.withSystemInspector(inspect, () => createActor.withExecutionIdentity(executionIdentity, () => effectDescriptor.initialTransition(logic, ...args)));
+      const [snapshot, effects] = inExecution(() => createActor.withExecutionIdentity(executionIdentity, () => effectDescriptor.initialTransition(logic, ...args)));
       return [installSystemRuntime(snapshot), tagEffects(effects)];
     },
     transition(snapshot, event) {
-      const [nextSnapshot, effects] = createActor.withSystemInspector(inspect, () => createActor.withExecutionIdentity(executionIdentity, () => effectDescriptor.transition(logic, snapshot, event)));
+      const [nextSnapshot, effects] = inExecution(() => createActor.withExecutionIdentity(executionIdentity, () => effectDescriptor.transition(logic, snapshot, event)));
       return [installSystemRuntime(nextSnapshot), tagEffects(effects)];
     },
     getActorRef(snapshot, address) {

package/dist/xstate-durable.development.cjs.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var dist_xstatePersist = require('./xstate-persist.development.cjs.js');
-var createActor = require('./createActor-a49ae0ce.development.cjs.js');
-var effectDescriptor = require('./effectDescriptor-f73da4ec.development.cjs.js');
-require('./machineSchemas-6d96bef4.development.cjs.js');
+var createActor = require('./createActor-c029d29f.development.cjs.js');
+var effectDescriptor = require('./effectDescriptor-3fff5c51.development.cjs.js');
+require('./legacySnapshot-ebf0b2b8.development.cjs.js');
 require('./validation-f2714a35.development.cjs.js');
 
 /** @experimental */
@@ -20,6 +20,36 @@ require('./validation-f2714a35.development.cjs.js');
  * @experimental
  */
 
+/**
+ * A root-addressed event that the execution received but has not processed,
+ * stored in a checkpoint. `source` is the sender's logical address.
+ *
+ * @experimental
+ */
+
+/**
+ * Everything needed to resume an execution: the persisted snapshot, the next
+ * transition index and the events received but not yet processed. Persist
+ * the whole object atomically and pass it to `restore()`.
+ *
+ * @experimental
+ */
+
+// Lifecycle events that address a child by `actorId`. Snapshot updates are
+// not stored: a restored child reports its current snapshot when it starts.
+const storedLifecycleEvents = new Set(['xstate.done.actor', 'xstate.error.actor', 'xstate.timeout.actor']);
+function isCheckpoint(value) {
+  return !!value && typeof value === 'object' && 'inbox' in value && 'nextTransitionIndex' in value && 'snapshot' in value;
+}
+function isInboxEntry(item) {
+  if (!item || typeof item !== 'object') return false;
+  const {
+    event,
+    source
+  } = item;
+  return !!event && typeof event.type === 'string' && (source === undefined || !!source && typeof source['@actor'] === 'string' && (source.incarnation === undefined || typeof source.incarnation === 'string'));
+}
+
 /** @experimental */
 
 /**
@@ -149,6 +179,15 @@ function createDurable(logic, adapter, options) {
   // loop to take them through `waitForEvent()`.
   const pendingRootEvents = [];
 
+  // For a stored lifecycle event: the child it addresses in `snapshot`, or
+  // `null` when that child is gone. `undefined` for any other event.
+  const lifecycleChild = (snapshot, event) => {
+    if (!createActor.isMachineSnapshot(snapshot) || !storedLifecycleEvents.has(event.type) || typeof event.actorId !== 'string') {
+      return undefined;
+    }
+    return snapshot.children[event.actorId] ?? null;
+  };
+
   // Every inter-actor edge is an async handoff to the runtime, and every
   // handoff queues behind the last one: hosts whose step or activity model
   // forbids concurrent entries depend on that, and so does deterministic
@@ -289,6 +328,16 @@ function createDurable(logic, adapter, options) {
   }
   const inspect = options?.inspect;
 
+  // Runs a transition as this execution: views it derives belong to this
+  // execution, and its systems report to the execution's inspector.
+  const owner = {
+    runtime: wrappedSystemRuntime,
+    inspect
+  };
+  function inExecution(fn) {
+    return createActor.withExecutionOwner(owner, () => createActor.withSystemInspector(inspect, fn));
+  }
+
   // Attaches the execution's inspector to a system that does not have it
   // yet. Systems constructed inside a transition get it at construction (the
   // ambient inspector); this covers systems materialized outside that window
@@ -319,10 +368,12 @@ function createDurable(logic, adapter, options) {
       const visit = actor => {
         if (!systems.has(actor.system)) {
           systems.add(actor.system);
-          if (wrappedSystemRuntime) {
-            actor.system.runtime = wrappedSystemRuntime;
+          if (createActor.adoptSystem(actor.system, owner)) {
+            if (wrappedSystemRuntime) {
+              actor.system.runtime = wrappedSystemRuntime;
+            }
+            wireInspection(actor.system);
           }
-          wireInspection(actor.system);
         }
         if (recursive) {
           const children = actor.getSnapshot().children;
@@ -354,14 +405,55 @@ function createDurable(logic, adapter, options) {
     get nextTransitionIndex() {
       return nextTransitionIndex;
     },
-    restore(persistedSnapshot) {
+    checkpoint(snapshot, persistOptions) {
+      const inbox = [];
+      for (const {
+        event,
+        source
+      } of pendingRootEvents) {
+        const child = lifecycleChild(snapshot, event);
+        if (event.type === 'xstate.snapshot.actor' || child !== undefined && (!child || event.sessionId !== undefined && child.sessionId !== undefined && child.sessionId !== event.sessionId)) {
+          continue;
+        }
+        inbox.push({
+          event,
+          source: source && {
+            '@actor': source.address,
+            ...(createActor.isRemoteActorRef(source) && source.sessionId !== undefined ? {
+              incarnation: source.sessionId
+            } : {})
+          }
+        });
+      }
+      return {
+        snapshot: logic.getPersistedSnapshot?.(snapshot, persistOptions) ?? snapshot,
+        nextTransitionIndex,
+        inbox
+      };
+    },
+    restore(checkpointOrSnapshot) {
+      const checkpoint = isCheckpoint(checkpointOrSnapshot) ? checkpointOrSnapshot : undefined;
       if (restored || nextTransitionIndex !== startingTransitionIndex || currentBatch) {
         throw new Error('restore() requires a fresh durable execution');
       }
+      if (checkpoint) {
+        if (!Array.isArray(checkpoint.inbox) || !checkpoint.inbox.every(isInboxEntry)) {
+          throw new TypeError('The checkpoint inbox is invalid.');
+        }
+        if (adapter.transitionIndex !== undefined && adapter.transitionIndex !== checkpoint.nextTransitionIndex) {
+          throw new RangeError(`The adapter's transitionIndex (${adapter.transitionIndex}) does not match the checkpoint's nextTransitionIndex (${checkpoint.nextTransitionIndex}).`);
+        }
+        if (!Number.isSafeInteger(checkpoint.nextTransitionIndex) || checkpoint.nextTransitionIndex < 0) {
+          throw new RangeError('nextTransitionIndex must be a non-negative safe integer');
+        }
+        nextTransitionIndex = checkpoint.nextTransitionIndex;
+        lastTransitionIndex = nextTransitionIndex === 0 ? undefined : nextTransitionIndex - 1;
+      }
+      const persistedSnapshot = checkpoint ? checkpoint.snapshot : checkpointOrSnapshot;
       const {
         snapshot,
         scope
-      } = createActor.withSystemInspector(inspect, () => createActor.withExecutionIdentity(executionIdentity, () => {
+      } = inExecution(() => createActor.withExecutionIdentity(executionIdentity, () => {
         const scope = createActor.createInertActorScope(logic);
         const snapshot = dist_xstatePersist.restoreLogicSnapshot(logic, persistedSnapshot, scope);
         createActor.setInertActorScopeSnapshot(scope, snapshot, false);
@@ -370,6 +462,24 @@ function createDurable(logic, adapter, options) {
           scope
         };
       }));
+      for (const {
+        event,
+        source
+      } of checkpoint?.inbox ?? []) {
+        const child = lifecycleChild(snapshot, event);
+        if (child === null) {
+          continue;
+        }
+        pendingRootEvents.push({
+          // A restored child has a new session; its pending lifecycle events
+          // follow it.
+          event: child && child.sessionId !== undefined && 'sessionId' in event ? {
+            ...event,
+            sessionId: child.sessionId
+          } : event,
+          source: source && execution.getActorRef(snapshot, source['@actor'])
+        });
+      }
       const effects = [];
       if (snapshot.status === 'active') {
         const {
@@ -399,11 +509,11 @@ function createDurable(logic, adapter, options) {
       if (restored) {
         throw new Error('initialTransition() cannot initialize a restored execution');
       }
-      const [snapshot, effects] = createActor.withSystemInspector(inspect, () => createActor.withExecutionIdentity(executionIdentity, () => effectDescriptor.initialTransition(logic, ...args)));
+      const [snapshot, effects] = inExecution(() => createActor.withExecutionIdentity(executionIdentity, () => effectDescriptor.initialTransition(logic, ...args)));
       return [installSystemRuntime(snapshot), tagEffects(effects)];
     },
     transition(snapshot, event) {
-      const [nextSnapshot, effects] = createActor.withSystemInspector(inspect, () => createActor.withExecutionIdentity(executionIdentity, () => effectDescriptor.transition(logic, snapshot, event)));
+      const [nextSnapshot, effects] = inExecution(() => createActor.withExecutionIdentity(executionIdentity, () => effectDescriptor.transition(logic, snapshot, event)));
       return [installSystemRuntime(nextSnapshot), tagEffects(effects)];
     },
     getActorRef(snapshot, address) {

package/dist/xstate-durable.development.esm.js

@@ -1,7 +1,7 @@
 import { restoreLogicSnapshot } from './xstate-persist.development.esm.js';
-import { j as encodeAddressSegment, aL as getRootActorId, aM as RUNTIME_OPERATIONS, aN as withSystemInspector, aI as isRemoteActorRef, aB as createStartEffect, aO as createTimerEffect, aP as getSnapshotActorRef, aQ as withExecutionIdentity, ah as createInertActorScope, ai as setInertActorScopeSnapshot, ak as attachSnapshotActorRef, y as matchesTimerKey, aR as getTimerStart, aS as recordTimerStart, K as deliverEvent } from './createActor-551369be.development.esm.js';
-import { a as initialTransition, t as transition, d as describeExecutableEffect } from './effectDescriptor-321a8ce9.development.esm.js';
-import './machineSchemas-b5736804.development.esm.js';
+import { j as encodeAddressSegment, aL as getRootActorId, aM as RUNTIME_OPERATIONS, aI as isRemoteActorRef, aB as createStartEffect, aN as createTimerEffect, aO as getSnapshotActorRef, z as isMachineSnapshot, aP as withExecutionOwner, y as matchesTimerKey, aQ as getTimerStart, aR as recordTimerStart, K as deliverEvent, aS as withSystemInspector, aT as adoptSystem, aU as withExecutionIdentity, ah as createInertActorScope, ai as setInertActorScopeSnapshot, ak as attachSnapshotActorRef } from './createActor-0250284a.development.esm.js';
+import { d as describeExecutableEffect, a as initialTransition, t as transition } from './effectDescriptor-5ac7dccb.development.esm.js';
+import './legacySnapshot-ae6594a7.development.esm.js';
 import './validation-e69470ad.development.esm.js';
 
 /** @experimental */
@@ -16,6 +16,36 @@ import './validation-e69470ad.development.esm.js';
  * @experimental
  */
 
+/**
+ * A root-addressed event that the execution received but has not processed,
+ * stored in a checkpoint. `source` is the sender's logical address.
+ *
+ * @experimental
+ */
+
+/**
+ * Everything needed to resume an execution: the persisted snapshot, the next
+ * transition index and the events received but not yet processed. Persist
+ * the whole object atomically and pass it to `restore()`.
+ *
+ * @experimental
+ */
+
+// Lifecycle events that address a child by `actorId`. Snapshot updates are
+// not stored: a restored child reports its current snapshot when it starts.
+const storedLifecycleEvents = new Set(['xstate.done.actor', 'xstate.error.actor', 'xstate.timeout.actor']);
+function isCheckpoint(value) {
+  return !!value && typeof value === 'object' && 'inbox' in value && 'nextTransitionIndex' in value && 'snapshot' in value;
+}
+function isInboxEntry(item) {
+  if (!item || typeof item !== 'object') return false;
+  const {
+    event,
+    source
+  } = item;
+  return !!event && typeof event.type === 'string' && (source === undefined || !!source && typeof source['@actor'] === 'string' && (source.incarnation === undefined || typeof source.incarnation === 'string'));
+}
+
 /** @experimental */
 
 /**
@@ -145,6 +175,15 @@ function createDurable(logic, adapter, options) {
   // loop to take them through `waitForEvent()`.
   const pendingRootEvents = [];
 
+  // For a stored lifecycle event: the child it addresses in `snapshot`, or
+  // `null` when that child is gone. `undefined` for any other event.
+  const lifecycleChild = (snapshot, event) => {
+    if (!isMachineSnapshot(snapshot) || !storedLifecycleEvents.has(event.type) || typeof event.actorId !== 'string') {
+      return undefined;
+    }
+    return snapshot.children[event.actorId] ?? null;
+  };
+
   // Every inter-actor edge is an async handoff to the runtime, and every
   // handoff queues behind the last one: hosts whose step or activity model
   // forbids concurrent entries depend on that, and so does deterministic
@@ -285,6 +324,16 @@ function createDurable(logic, adapter, options) {
   }
   const inspect = options?.inspect;
 
+  // Runs a transition as this execution: views it derives belong to this
+  // execution, and its systems report to the execution's inspector.
+  const owner = {
+    runtime: wrappedSystemRuntime,
+    inspect
+  };
+  function inExecution(fn) {
+    return withExecutionOwner(owner, () => withSystemInspector(inspect, fn));
+  }
+
   // Attaches the execution's inspector to a system that does not have it
   // yet. Systems constructed inside a transition get it at construction (the
   // ambient inspector); this covers systems materialized outside that window
@@ -315,10 +364,12 @@ function createDurable(logic, adapter, options) {
       const visit = actor => {
         if (!systems.has(actor.system)) {
           systems.add(actor.system);
-          if (wrappedSystemRuntime) {
-            actor.system.runtime = wrappedSystemRuntime;
+          if (adoptSystem(actor.system, owner)) {
+            if (wrappedSystemRuntime) {
+              actor.system.runtime = wrappedSystemRuntime;
+            }
+            wireInspection(actor.system);
           }
-          wireInspection(actor.system);
         }
         if (recursive) {
           const children = actor.getSnapshot().children;
@@ -350,14 +401,55 @@ function createDurable(logic, adapter, options) {
     get nextTransitionIndex() {
       return nextTransitionIndex;
     },
-    restore(persistedSnapshot) {
+    checkpoint(snapshot, persistOptions) {
+      const inbox = [];
+      for (const {
+        event,
+        source
+      } of pendingRootEvents) {
+        const child = lifecycleChild(snapshot, event);
+        if (event.type === 'xstate.snapshot.actor' || child !== undefined && (!child || event.sessionId !== undefined && child.sessionId !== undefined && child.sessionId !== event.sessionId)) {
+          continue;
+        }
+        inbox.push({
+          event,
+          source: source && {
+            '@actor': source.address,
+            ...(isRemoteActorRef(source) && source.sessionId !== undefined ? {
+              incarnation: source.sessionId
+            } : {})
+          }
+        });
+      }
+      return {
+        snapshot: logic.getPersistedSnapshot?.(snapshot, persistOptions) ?? snapshot,
+        nextTransitionIndex,
+        inbox
+      };
+    },
+    restore(checkpointOrSnapshot) {
+      const checkpoint = isCheckpoint(checkpointOrSnapshot) ? checkpointOrSnapshot : undefined;
       if (restored || nextTransitionIndex !== startingTransitionIndex || currentBatch) {
         throw new Error('restore() requires a fresh durable execution');
       }
+      if (checkpoint) {
+        if (!Array.isArray(checkpoint.inbox) || !checkpoint.inbox.every(isInboxEntry)) {
+          throw new TypeError('The checkpoint inbox is invalid.');
+        }
+        if (adapter.transitionIndex !== undefined && adapter.transitionIndex !== checkpoint.nextTransitionIndex) {
+          throw new RangeError(`The adapter's transitionIndex (${adapter.transitionIndex}) does not match the checkpoint's nextTransitionIndex (${checkpoint.nextTransitionIndex}).`);
+        }
+        if (!Number.isSafeInteger(checkpoint.nextTransitionIndex) || checkpoint.nextTransitionIndex < 0) {
+          throw new RangeError('nextTransitionIndex must be a non-negative safe integer');
+        }
+        nextTransitionIndex = checkpoint.nextTransitionIndex;
+        lastTransitionIndex = nextTransitionIndex === 0 ? undefined : nextTransitionIndex - 1;
+      }
+      const persistedSnapshot = checkpoint ? checkpoint.snapshot : checkpointOrSnapshot;
       const {
         snapshot,
         scope
-      } = withSystemInspector(inspect, () => withExecutionIdentity(executionIdentity, () => {
+      } = inExecution(() => withExecutionIdentity(executionIdentity, () => {
         const scope = createInertActorScope(logic);
         const snapshot = restoreLogicSnapshot(logic, persistedSnapshot, scope);
         setInertActorScopeSnapshot(scope, snapshot, false);
@@ -366,6 +458,24 @@ function createDurable(logic, adapter, options) {
           scope
         };
       }));
+      for (const {
+        event,
+        source
+      } of checkpoint?.inbox ?? []) {
+        const child = lifecycleChild(snapshot, event);
+        if (child === null) {
+          continue;
+        }
+        pendingRootEvents.push({
+          // A restored child has a new session; its pending lifecycle events
+          // follow it.
+          event: child && child.sessionId !== undefined && 'sessionId' in event ? {
+            ...event,
+            sessionId: child.sessionId
+          } : event,
+          source: source && execution.getActorRef(snapshot, source['@actor'])
+        });
+      }
       const effects = [];
       if (snapshot.status === 'active') {
         const {
@@ -395,11 +505,11 @@ function createDurable(logic, adapter, options) {
       if (restored) {
         throw new Error('initialTransition() cannot initialize a restored execution');
       }
-      const [snapshot, effects] = withSystemInspector(inspect, () => withExecutionIdentity(executionIdentity, () => initialTransition(logic, ...args)));
+      const [snapshot, effects] = inExecution(() => withExecutionIdentity(executionIdentity, () => initialTransition(logic, ...args)));
       return [installSystemRuntime(snapshot), tagEffects(effects)];
     },
     transition(snapshot, event) {
-      const [nextSnapshot, effects] = withSystemInspector(inspect, () => withExecutionIdentity(executionIdentity, () => transition(logic, snapshot, event)));
+      const [nextSnapshot, effects] = inExecution(() => withExecutionIdentity(executionIdentity, () => transition(logic, snapshot, event)));
       return [installSystemRuntime(nextSnapshot), tagEffects(effects)];
     },
     getActorRef(snapshot, address) {