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

package/dist/xstate.development.esm.js

@@ -1,11 +1,11 @@
 import { createAsyncLogic, TimeoutError } from './xstate-actors.development.esm.js';
 export { TimeoutError, createAsyncLogic, createCallbackLogic, createEmptyActor, createEventObservableLogic, createObservableLogic, createStepLogic } from './xstate-actors.development.esm.js';
-import { m as matchesEventDescriptor, t as toArray, d as diagnoseAuthorConfig, p as parseDelayToMilliseconds, a as assertUnreservedSourceName, i as isAtomicStateNode, P as ProcessingStatus, g as getAllStateNodes, b as getStateNodes, r as resolveInvokedActorLogic, c as isActorRefLike, e as createMachineSnapshot, f as diagnoseSetupConfig, h as createActor, j as encodeAddressSegment, s as systemLogicMetadata, k as getActorIdPrefix, l as finalizeTransitionResult, n as getTimerKey, o as isSerializedActorRef, q as readTimerKey, X as XSTATE_STOP_EFFECT, u as XSTATE_STOP, v as createDoneActorEvent, w as createErrorActorEvent, x as serializeTimerKey, y as matchesTimerKey, z as isMachineSnapshot, A as listenerLogic, B as subscriptionLogic } from './createActor-551369be.development.esm.js';
-export { E as Actor, I as InfiniteTransitionError, p as _parseDelayToMilliseconds, G as _toObserver, h as createActor, C as createListenerLogic, D as createSubscriptionLogic, K as deliverEvent, H as executeEffects, b as getStateNodes, J as isBuiltInExecutableEffect, z as isMachineSnapshot, F as matchesState, L as runStep, M as stopActor, N as terminateActor } from './createActor-551369be.development.esm.js';
-import { S as StateMachine, h as historicalEventSchema, s as snapshotSchema } from './machineSchemas-b5736804.development.esm.js';
-export { I as InvalidSnapshotError, S as StateMachine, a as StateNode, e as eventSchema } from './machineSchemas-b5736804.development.esm.js';
+import { m as matchesEventDescriptor, t as toArray, d as diagnoseAuthorConfig, p as parseDelayToMilliseconds, a as assertUnreservedSourceName, i as isAtomicStateNode, P as ProcessingStatus, g as getAllStateNodes, b as getStateNodes, r as resolveInvokedActorLogic, c as isActorRefLike, e as createMachineSnapshot, f as diagnoseSetupConfig, h as createActor, j as encodeAddressSegment, s as systemLogicMetadata, k as getActorIdPrefix, l as finalizeTransitionResult, n as getTimerKey, o as isSerializedActorRef, q as readTimerKey, X as XSTATE_STOP_EFFECT, u as XSTATE_STOP, v as createDoneActorEvent, w as createErrorActorEvent, x as serializeTimerKey, y as matchesTimerKey, z as isMachineSnapshot, A as listenerLogic, B as subscriptionLogic } from './createActor-0250284a.development.esm.js';
+export { E as Actor, I as InfiniteTransitionError, p as _parseDelayToMilliseconds, G as _toObserver, h as createActor, C as createListenerLogic, D as createSubscriptionLogic, K as deliverEvent, H as executeEffects, b as getStateNodes, J as isBuiltInExecutableEffect, z as isMachineSnapshot, F as matchesState, L as runStep, M as stopActor, N as terminateActor } from './createActor-0250284a.development.esm.js';
+import { S as StateMachine, h as historicalEventSchema, s as snapshotSchema, u as upgradeLegacySystemSnapshot } from './legacySnapshot-ae6594a7.development.esm.js';
+export { I as InvalidSnapshotError, S as StateMachine, a as StateNode, e as eventSchema } from './legacySnapshot-ae6594a7.development.esm.js';
 export { i as isTypeSchema, t as types } from './schema.types-1cd4652e.development.esm.js';
-export { d as describeExecutableEffect, b as getInitialMicrosteps, g as getMicrosteps, c as getNextTransitions, a as initialTransition, i as isUnhandled, t as transition } from './effectDescriptor-321a8ce9.development.esm.js';
+export { d as describeExecutableEffect, b as getInitialMicrosteps, g as getMicrosteps, c as getNextTransitions, a as initialTransition, i as isUnhandled, t as transition } from './effectDescriptor-5ac7dccb.development.esm.js';
 import './validation-e69470ad.development.esm.js';
 
 /**
@@ -2110,13 +2110,13 @@ class SimulatedClock {
 // logical timer key (or, for a directly delivered event, the event type).
 function systemTimerKey(source, event) {
   const key = event.type === 'xstate.timer' ? readTimerKey(event) : undefined;
-  return JSON.stringify([source.$actor, source.incarnation, key ? serializeTimerKey(key) : event.type]);
+  return JSON.stringify([source['@actor'], source.incarnation, key ? serializeTimerKey(key) : event.type]);
 }
 function isLogicalTimerPending(snapshot, key) {
   return (snapshot.timers ?? []).some(timer => matchesTimerKey(timer, key));
 }
 function isReference(value) {
-  return !!value && typeof value.$actor === 'string' && typeof value.incarnation === 'string';
+  return !!value && typeof value['@actor'] === 'string' && typeof value.incarnation === 'string';
 }
 function isHandle(value) {
   return !!value && typeof value.address === 'string' && typeof value.getSnapshot === 'function';
@@ -2127,12 +2127,12 @@ const systemLogger = () => {};
 /** Converts runtime-shaped, reduction-local capabilities to snapshot data. */
 function encode(value, seen = new Set(), mappers) {
   if (typeof value === 'function' && mappers?.has(value)) return {
-    $systemMapper: mappers.get(value)
+    '@systemMapper': mappers.get(value)
   };
   if (isHandle(value)) {
     if (!value[systemActorHandle]) throw new Error('Live actors cannot be stored in a pure system snapshot.');
     return {
-      $actor: value.address,
+      '@actor': value.address,
       incarnation: value.sessionId
     };
   }
@@ -2145,11 +2145,11 @@ function encode(value, seen = new Set(), mappers) {
   let result;
   if (value.machine && typeof value.machine.transition === 'function' && typeof value.id === 'string' && Array.isArray(value.path)) {
     result = {
-      $stateNode: value.id
+      '@stateNode': value.id
     };
   } else if (value instanceof Error) {
     result = {
-      $error: value.name,
+      '@error': value.name,
       message: value.message
     };
   } else if (Array.isArray(value)) {
@@ -2175,10 +2175,17 @@ function snapshotData(snapshot, mappers) {
     getMeta,
     getInputs,
     toJSON,
+    // Stores such as Convex reject `_`-prefixed field names.
+    _stateInputs: stateInputs,
+    _nextTimerId: nextTimerId,
+    _nextActorIds: nextActorIds,
     ...data
   } = snapshot;
   return encode({
     ...data,
+    stateInputs,
+    nextTimerId,
+    nextActorIds,
     nodeIds: nodes.map(node => node.id)
   }, new Set(), mappers);
 }
@@ -2222,6 +2229,8 @@ class SystemReduction {
     this.mappers = void 0;
     this.remaining = void 0;
     if (!Number.isSafeInteger(maxSteps) || maxSteps < 1) throw new Error('maxSteps must be a positive integer.');
+    // TODO(v7): remove with legacySnapshot.ts.
+    snapshot = upgradeLegacySystemSnapshot(snapshot);
     this.logic = definitions(logic);
     this.mappers = logic.mappers ?? {};
     this.mapperNames = new Map(Object.entries(this.mappers).map(([key, mapper]) => [mapper, key]));
@@ -2252,26 +2261,26 @@ class SystemReduction {
   }
   reference(actor) {
     return {
-      $actor: actor.address,
+      '@actor': actor.address,
       incarnation: actor.sessionId
     };
   }
   current(ref) {
-    const actor = this.snapshot.actors[ref.$actor];
+    const actor = this.snapshot.actors[ref['@actor']];
     return actor?.incarnation === ref.incarnation ? actor : undefined;
   }
   decode(value, machine) {
     if (isReference(value)) return this.handle(value);
     if (!value || typeof value !== 'object') return value;
-    if (typeof value.$systemMapper === 'string') {
-      const mapper = Object.hasOwn(this.mappers, value.$systemMapper) && this.mappers[value.$systemMapper];
-      if (!mapper) throw new Error(`Missing pure mapper '${value.$systemMapper}'.`);
+    if (typeof value['@systemMapper'] === 'string') {
+      const mapper = Object.hasOwn(this.mappers, value['@systemMapper']) && this.mappers[value['@systemMapper']];
+      if (!mapper) throw new Error(`Missing pure mapper '${value['@systemMapper']}'.`);
       return mapper;
     }
-    if (typeof value.$stateNode === 'string') return machine.getStateNodeById(value.$stateNode);
-    if (typeof value.$error === 'string') {
+    if (typeof value['@stateNode'] === 'string') return machine.getStateNodeById(value['@stateNode']);
+    if (typeof value['@error'] === 'string') {
       const error = new Error(value.message);
-      error.name = value.$error;
+      error.name = value['@error'];
       if (error.name === 'TimeoutError') Object.setPrototypeOf(error, TimeoutError.prototype);
       return error;
     }
@@ -2289,7 +2298,7 @@ class SystemReduction {
       const kind = this.attachedKind(actor);
       if (!actor.started || actor.snapshot.status !== 'active' || kind !== '@xstate.listener' && kind !== '@xstate.subscription') continue;
       const target = actor.input.actor;
-      if (!target || target.$actor !== source.$actor || target.incarnation !== source.incarnation || !actor.parent || this.current(actor.parent)?.snapshot.status !== 'active') continue;
+      if (!target || target['@actor'] !== source['@actor'] || target.incarnation !== source.incarnation || !actor.parent || this.current(actor.parent)?.snapshot.status !== 'active') continue;
       const input = this.decode(actor.input);
       let event;
       if (kind === '@xstate.listener') {
@@ -2300,7 +2309,7 @@ class SystemReduction {
         if (mapper) event = mapper(snapshot.status === 'done' ? snapshot.output : snapshot.status === 'error' ? snapshot.error : snapshot);
       }
       if (event) this.enqueue({
-        $actor: actor.address,
+        '@actor': actor.address,
         incarnation: actor.incarnation
       }, actor.parent, event);
     }
@@ -2308,8 +2317,8 @@ class SystemReduction {
   stopAttachments(parent) {
     for (const actor of Object.values(this.snapshot.actors)) {
       const kind = this.attachedKind(actor);
-      if ((kind === '@xstate.listener' || kind === '@xstate.subscription') && actor.parent?.$actor === parent.$actor && actor.parent.incarnation === parent.incarnation) this.stop({
-        $actor: actor.address,
+      if ((kind === '@xstate.listener' || kind === '@xstate.subscription') && actor.parent?.['@actor'] === parent['@actor'] && actor.parent.incarnation === parent.incarnation) this.stop({
+        '@actor': actor.address,
         incarnation: actor.incarnation
       });
     }
@@ -2328,6 +2337,9 @@ class SystemReduction {
     const data = this.decode(actor.snapshot, logic);
     const snapshot = typeof logic.getStateNodeById === 'function' && data.nodeIds ? createMachineSnapshot({
       ...data,
+      _stateInputs: data.stateInputs,
+      _nextTimerId: data.nextTimerId,
+      _nextActorIds: data.nextActorIds,
       _nodes: data.nodeIds.map(id => logic.getStateNodeById(id))
     }, logic) : data;
     this.snapshots.set(key, snapshot);
@@ -2350,8 +2362,8 @@ class SystemReduction {
     };
     const handle = {
       [systemActorHandle]: true,
-      id: actor?.id ?? ref.$actor.split('/').at(-1),
-      address: ref.$actor,
+      id: actor?.id ?? ref['@actor'].split('/').at(-1),
+      address: ref['@actor'],
       sessionId: ref.incarnation,
       options: {
         _inert: true,
@@ -2390,13 +2402,13 @@ class SystemReduction {
       _unregister: actor => {
         this.stopping.add(JSON.stringify(this.reference(actor)));
         for (const [key, ref] of Object.entries(this.snapshot.registry)) {
-          if (ref.$actor === actor.address && ref.incarnation === actor.sessionId) delete this.snapshot.registry[key];
+          if (ref['@actor'] === actor.address && ref.incarnation === actor.sessionId) delete this.snapshot.registry[key];
         }
       },
       _getByAddress: address => {
         const actor = this.snapshot.actors[address];
         return actor?.snapshot.status === 'active' ? this.handle({
-          $actor: address,
+          '@actor': address,
           incarnation: actor.incarnation
         }) : undefined;
       },
@@ -2442,11 +2454,11 @@ class SystemReduction {
     if (!definition) throw new Error('Register dynamically spawned logic in systemLogic.actors.');
     const parent = options.parent && this.reference(options.parent);
     const id = options.id ?? `${getActorIdPrefix(options.src ?? logic)}:${this.snapshot.counters.actor}`;
-    const address = `${parent ? parent.$actor + '/' : ''}${encodeAddressSegment(id)}`;
+    const address = `${parent ? parent['@actor'] + '/' : ''}${encodeAddressSegment(id)}`;
     const occupied = this.snapshot.actors[address];
     if (occupied?.snapshot.status === 'active') {
       const previous = {
-        $actor: address,
+        '@actor': address,
         incarnation: occupied.incarnation
       };
       if (!this.stopping.has(JSON.stringify(previous))) throw new Error(`Actor address '${address}' is already occupied.`);
@@ -2454,7 +2466,7 @@ class SystemReduction {
     }
     const incarnation = String(this.snapshot.counters.actor++);
     const ref = {
-      $actor: address,
+      '@actor': address,
       incarnation
     };
     const state = {
@@ -2492,7 +2504,7 @@ class SystemReduction {
     const actor = this.current(ref);
     if (!actor) return;
     this.snapshots.set(JSON.stringify(ref), snapshot);
-    this.snapshot.actors[ref.$actor] = {
+    this.snapshot.actors[ref['@actor']] = {
       ...actor,
       snapshot: snapshotData(snapshot, this.mapperNames)
     };
@@ -2542,7 +2554,7 @@ class SystemReduction {
       ...key
     });
     for (const [timerKey, timer] of Object.entries(this.snapshot.timers)) {
-      if (timer.source.$actor === ref.$actor && timer.source.incarnation === ref.incarnation && (cancelled === undefined || timerKey === cancelled)) delete this.snapshot.timers[timerKey];
+      if (timer.source['@actor'] === ref['@actor'] && timer.source.incarnation === ref.incarnation && (cancelled === undefined || timerKey === cancelled)) delete this.snapshot.timers[timerKey];
     }
   }
   effectsFor(ref, effects) {
@@ -2580,9 +2592,9 @@ class SystemReduction {
             } else if (isSerializedActorRef(value.target)) {
               // A ref that went through JSON targets the current incarnation
               // at its address; without one the event is a dead letter.
-              const target = this.snapshot.actors[value.target.$actor];
+              const target = this.snapshot.actors[value.target['@actor']];
               if (target?.snapshot.status === 'active' && (value.target.incarnation === undefined || value.target.incarnation === target.incarnation)) this.enqueue(ref, {
-                $actor: target.address,
+                '@actor': target.address,
                 incarnation: target.incarnation
               }, value.event);else this.external(ref, {
                 kind: 'builtin',
@@ -2622,7 +2634,7 @@ class SystemReduction {
   start(ref) {
     const actor = this.current(ref);
     if (!actor || actor.started || actor.snapshot.status === 'stopped') return;
-    this.snapshot.actors[ref.$actor] = {
+    this.snapshot.actors[ref['@actor']] = {
       ...actor,
       started: true
     };
@@ -2662,13 +2674,13 @@ class SystemReduction {
     });
     this.cancel(ref);
     this.handle(ref).system._unregister(this.handle(ref));
-    this.snapshot.messages = this.snapshot.messages.filter(message => message.target.$actor !== ref.$actor || message.target.incarnation !== ref.incarnation);
+    this.snapshot.messages = this.snapshot.messages.filter(message => message.target['@actor'] !== ref['@actor'] || message.target.incarnation !== ref.incarnation);
     this.cancelExternal(ref);
     this.stopAttachments(ref);
   }
   cancelExternal(ref) {
     for (const [id, effect] of Object.entries(this.snapshot.externalEffects)) {
-      if (effect.kind !== 'action' || effect.type === '@xstate.cancelEffect' || effect.type === '@xstate.cleanup' || effect.source.$actor !== ref.$actor || effect.source.incarnation !== ref.incarnation) continue;
+      if (effect.kind !== 'action' || effect.type === '@xstate.cancelEffect' || effect.type === '@xstate.cleanup' || effect.source['@actor'] !== ref['@actor'] || effect.source.incarnation !== ref.incarnation) continue;
       delete this.snapshot.externalEffects[id];
       const cancellation = {
         id: `${this.snapshot.executionId}:${this.snapshot.counters.effect++}`,
@@ -2705,7 +2717,7 @@ class SystemReduction {
     }
     const logic = this.logic.get(actor.src);
     if (!logic) throw new Error(`Missing actor definition '${actor.src}'.`);
-    if (logic.isInternalEventType?.(message.event.type) && (!message.source || message.source.$actor !== actor.address || message.source.incarnation !== actor.incarnation)) {
+    if (logic.isInternalEventType?.(message.event.type) && (!message.source || message.source['@actor'] !== actor.address || message.source.incarnation !== actor.incarnation)) {
       throw new Error(`Internal event '${message.event.type}' cannot be injected into a pure system.`);
     }
     if (!message.source && /^(xstate\.after(?:\.|$)|xstate\.timeout(?:\.|$))/.test(message.event.type)) throw new Error('Select a pending timer instead of injecting its internal event.');
@@ -2762,7 +2774,7 @@ class SystemReduction {
     if (event.type === 'xstate.timer') {
       const actor = this.snapshot.actors[path];
       if (!actor) throw new Error(`Unknown actor address '${path}'.`);
-      const timer = Object.values(this.snapshot.timers).find(pending => pending.source.$actor === path && pending.source.incarnation === actor.incarnation && pending.occurrence === event.occurrence);
+      const timer = Object.values(this.snapshot.timers).find(pending => pending.source['@actor'] === path && pending.source.incarnation === actor.incarnation && pending.occurrence === event.occurrence);
       if (!timer) throw new Error('Select a current timer occurrence.');
       this.advance(timer.dueAt);
       return;
@@ -2771,12 +2783,12 @@ class SystemReduction {
     const actor = this.snapshot.actors[path];
     if (!actor) throw new Error(`Unknown actor address '${path}'.`);
     const ref = {
-      $actor: path,
+      '@actor': path,
       incarnation: actor.incarnation
     };
     if (event.type === 'xstate.system.effect.result') {
       const effect = this.snapshot.externalEffects[event.effectId];
-      if (!effect || effect.source.$actor !== path || event.event && (effect.source.incarnation !== actor.incarnation || actor.snapshot.status !== 'active' || effect.type === '@xstate.cancelEffect' || effect.type === '@xstate.cleanup')) throw new Error('External effect result does not match its owner or is stale.');
+      if (!effect || effect.source['@actor'] !== path || event.event && (effect.source.incarnation !== actor.incarnation || actor.snapshot.status !== 'active' || effect.type === '@xstate.cancelEffect' || effect.type === '@xstate.cleanup')) throw new Error('External effect result does not match its owner or is stale.');
       delete this.snapshot.externalEffects[event.effectId];
       if (event.event) {
         this.enqueue(ref, ref, event.event);

package/dist/xstate.esm.js

@@ -1,11 +1,11 @@
 import { createAsyncLogic, TimeoutError } from './xstate-actors.esm.js';
 export { TimeoutError, createAsyncLogic, createCallbackLogic, createEmptyActor, createEventObservableLogic, createObservableLogic, createStepLogic } from './xstate-actors.esm.js';
-import { m as matchesEventDescriptor, x as xstateError, t as toArray, d as diagnoseAuthorConfig, p as parseDelayToMilliseconds, a as assertUnreservedSourceName, i as isAtomicStateNode, P as ProcessingStatus, g as getAllStateNodes, b as getStateNodes, r as resolveInvokedActorLogic, c as isActorRefLike, e as createMachineSnapshot, f as diagnoseSetupConfig, h as createActor, j as encodeAddressSegment, s as systemLogicMetadata, k as getActorIdPrefix, l as finalizeTransitionResult, n as getTimerKey, o as isSerializedActorRef, q as readTimerKey, X as XSTATE_STOP_EFFECT, u as XSTATE_STOP, v as createDoneActorEvent, w as createErrorActorEvent, y as serializeTimerKey, z as matchesTimerKey, A as isMachineSnapshot, B as listenerLogic, C as subscriptionLogic } from './createActor-cbe3abac.esm.js';
-export { F as Actor, I as InfiniteTransitionError, p as _parseDelayToMilliseconds, H as _toObserver, h as createActor, D as createListenerLogic, E as createSubscriptionLogic, L as deliverEvent, J as executeEffects, b as getStateNodes, K as isBuiltInExecutableEffect, A as isMachineSnapshot, G as matchesState, M as runStep, N as stopActor, O as terminateActor } from './createActor-cbe3abac.esm.js';
-import { S as StateMachine, h as historicalEventSchema, s as snapshotSchema } from './machineSchemas-45c21bc2.esm.js';
-export { I as InvalidSnapshotError, S as StateMachine, a as StateNode, e as eventSchema } from './machineSchemas-45c21bc2.esm.js';
+import { m as matchesEventDescriptor, x as xstateError, t as toArray, d as diagnoseAuthorConfig, p as parseDelayToMilliseconds, a as assertUnreservedSourceName, i as isAtomicStateNode, P as ProcessingStatus, g as getAllStateNodes, b as getStateNodes, r as resolveInvokedActorLogic, c as isActorRefLike, e as createMachineSnapshot, f as diagnoseSetupConfig, h as createActor, j as encodeAddressSegment, s as systemLogicMetadata, k as getActorIdPrefix, l as finalizeTransitionResult, n as getTimerKey, o as isSerializedActorRef, q as readTimerKey, X as XSTATE_STOP_EFFECT, u as XSTATE_STOP, v as createDoneActorEvent, w as createErrorActorEvent, y as serializeTimerKey, z as matchesTimerKey, A as isMachineSnapshot, B as listenerLogic, C as subscriptionLogic } from './createActor-20a97166.esm.js';
+export { F as Actor, I as InfiniteTransitionError, p as _parseDelayToMilliseconds, H as _toObserver, h as createActor, D as createListenerLogic, E as createSubscriptionLogic, L as deliverEvent, J as executeEffects, b as getStateNodes, K as isBuiltInExecutableEffect, A as isMachineSnapshot, G as matchesState, M as runStep, N as stopActor, O as terminateActor } from './createActor-20a97166.esm.js';
+import { S as StateMachine, h as historicalEventSchema, s as snapshotSchema, u as upgradeLegacySystemSnapshot } from './legacySnapshot-9e06feb4.esm.js';
+export { I as InvalidSnapshotError, S as StateMachine, a as StateNode, e as eventSchema } from './legacySnapshot-9e06feb4.esm.js';
 export { i as isTypeSchema, t as types } from './schema.types-0ecd17b8.esm.js';
-export { d as describeExecutableEffect, b as getInitialMicrosteps, g as getMicrosteps, c as getNextTransitions, a as initialTransition, i as isUnhandled, t as transition } from './effectDescriptor-d8b0f749.esm.js';
+export { d as describeExecutableEffect, b as getInitialMicrosteps, g as getMicrosteps, c as getNextTransitions, a as initialTransition, i as isUnhandled, t as transition } from './effectDescriptor-e93df910.esm.js';
 import './validation-05f1d517.esm.js';
 
 /**
@@ -2110,13 +2110,13 @@ class SimulatedClock {
 // logical timer key (or, for a directly delivered event, the event type).
 function systemTimerKey(source, event) {
   const key = event.type === 'xstate.timer' ? readTimerKey(event) : undefined;
-  return JSON.stringify([source.$actor, source.incarnation, key ? serializeTimerKey(key) : event.type]);
+  return JSON.stringify([source['@actor'], source.incarnation, key ? serializeTimerKey(key) : event.type]);
 }
 function isLogicalTimerPending(snapshot, key) {
   return (snapshot.timers ?? []).some(timer => matchesTimerKey(timer, key));
 }
 function isReference(value) {
-  return !!value && typeof value.$actor === 'string' && typeof value.incarnation === 'string';
+  return !!value && typeof value['@actor'] === 'string' && typeof value.incarnation === 'string';
 }
 function isHandle(value) {
   return !!value && typeof value.address === 'string' && typeof value.getSnapshot === 'function';
@@ -2127,12 +2127,12 @@ const systemLogger = () => {};
 /** Converts runtime-shaped, reduction-local capabilities to snapshot data. */
 function encode(value, seen = new Set(), mappers) {
   if (typeof value === 'function' && mappers?.has(value)) return {
-    $systemMapper: mappers.get(value)
+    '@systemMapper': mappers.get(value)
   };
   if (isHandle(value)) {
     if (!value[systemActorHandle]) throw new Error('Live actors cannot be stored in a pure system snapshot.');
     return {
-      $actor: value.address,
+      '@actor': value.address,
       incarnation: value.sessionId
     };
   }
@@ -2145,11 +2145,11 @@ function encode(value, seen = new Set(), mappers) {
   let result;
   if (value.machine && typeof value.machine.transition === 'function' && typeof value.id === 'string' && Array.isArray(value.path)) {
     result = {
-      $stateNode: value.id
+      '@stateNode': value.id
     };
   } else if (value instanceof Error) {
     result = {
-      $error: value.name,
+      '@error': value.name,
       message: value.message
     };
   } else if (Array.isArray(value)) {
@@ -2175,10 +2175,17 @@ function snapshotData(snapshot, mappers) {
     getMeta,
     getInputs,
     toJSON,
+    // Stores such as Convex reject `_`-prefixed field names.
+    _stateInputs: stateInputs,
+    _nextTimerId: nextTimerId,
+    _nextActorIds: nextActorIds,
     ...data
   } = snapshot;
   return encode({
     ...data,
+    stateInputs,
+    nextTimerId,
+    nextActorIds,
     nodeIds: nodes.map(node => node.id)
   }, new Set(), mappers);
 }
@@ -2222,6 +2229,8 @@ class SystemReduction {
     this.mappers = void 0;
     this.remaining = void 0;
     if (!Number.isSafeInteger(maxSteps) || maxSteps < 1) throw new Error('maxSteps must be a positive integer.');
+    // TODO(v7): remove with legacySnapshot.ts.
+    snapshot = upgradeLegacySystemSnapshot(snapshot);
     this.logic = definitions(logic);
     this.mappers = logic.mappers ?? {};
     this.mapperNames = new Map(Object.entries(this.mappers).map(([key, mapper]) => [mapper, key]));
@@ -2252,26 +2261,26 @@ class SystemReduction {
   }
   reference(actor) {
     return {
-      $actor: actor.address,
+      '@actor': actor.address,
       incarnation: actor.sessionId
     };
   }
   current(ref) {
-    const actor = this.snapshot.actors[ref.$actor];
+    const actor = this.snapshot.actors[ref['@actor']];
     return actor?.incarnation === ref.incarnation ? actor : undefined;
   }
   decode(value, machine) {
     if (isReference(value)) return this.handle(value);
     if (!value || typeof value !== 'object') return value;
-    if (typeof value.$systemMapper === 'string') {
-      const mapper = Object.hasOwn(this.mappers, value.$systemMapper) && this.mappers[value.$systemMapper];
-      if (!mapper) throw new Error(`Missing pure mapper '${value.$systemMapper}'.`);
+    if (typeof value['@systemMapper'] === 'string') {
+      const mapper = Object.hasOwn(this.mappers, value['@systemMapper']) && this.mappers[value['@systemMapper']];
+      if (!mapper) throw new Error(`Missing pure mapper '${value['@systemMapper']}'.`);
       return mapper;
     }
-    if (typeof value.$stateNode === 'string') return machine.getStateNodeById(value.$stateNode);
-    if (typeof value.$error === 'string') {
+    if (typeof value['@stateNode'] === 'string') return machine.getStateNodeById(value['@stateNode']);
+    if (typeof value['@error'] === 'string') {
       const error = new Error(value.message);
-      error.name = value.$error;
+      error.name = value['@error'];
       if (error.name === 'TimeoutError') Object.setPrototypeOf(error, TimeoutError.prototype);
       return error;
     }
@@ -2289,7 +2298,7 @@ class SystemReduction {
       const kind = this.attachedKind(actor);
       if (!actor.started || actor.snapshot.status !== 'active' || kind !== '@xstate.listener' && kind !== '@xstate.subscription') continue;
       const target = actor.input.actor;
-      if (!target || target.$actor !== source.$actor || target.incarnation !== source.incarnation || !actor.parent || this.current(actor.parent)?.snapshot.status !== 'active') continue;
+      if (!target || target['@actor'] !== source['@actor'] || target.incarnation !== source.incarnation || !actor.parent || this.current(actor.parent)?.snapshot.status !== 'active') continue;
       const input = this.decode(actor.input);
       let event;
       if (kind === '@xstate.listener') {
@@ -2300,7 +2309,7 @@ class SystemReduction {
         if (mapper) event = mapper(snapshot.status === 'done' ? snapshot.output : snapshot.status === 'error' ? snapshot.error : snapshot);
       }
       if (event) this.enqueue({
-        $actor: actor.address,
+        '@actor': actor.address,
         incarnation: actor.incarnation
       }, actor.parent, event);
     }
@@ -2308,8 +2317,8 @@ class SystemReduction {
   stopAttachments(parent) {
     for (const actor of Object.values(this.snapshot.actors)) {
       const kind = this.attachedKind(actor);
-      if ((kind === '@xstate.listener' || kind === '@xstate.subscription') && actor.parent?.$actor === parent.$actor && actor.parent.incarnation === parent.incarnation) this.stop({
-        $actor: actor.address,
+      if ((kind === '@xstate.listener' || kind === '@xstate.subscription') && actor.parent?.['@actor'] === parent['@actor'] && actor.parent.incarnation === parent.incarnation) this.stop({
+        '@actor': actor.address,
         incarnation: actor.incarnation
       });
     }
@@ -2328,6 +2337,9 @@ class SystemReduction {
     const data = this.decode(actor.snapshot, logic);
     const snapshot = typeof logic.getStateNodeById === 'function' && data.nodeIds ? createMachineSnapshot({
       ...data,
+      _stateInputs: data.stateInputs,
+      _nextTimerId: data.nextTimerId,
+      _nextActorIds: data.nextActorIds,
       _nodes: data.nodeIds.map(id => logic.getStateNodeById(id))
     }, logic) : data;
     this.snapshots.set(key, snapshot);
@@ -2350,8 +2362,8 @@ class SystemReduction {
     };
     const handle = {
       [systemActorHandle]: true,
-      id: actor?.id ?? ref.$actor.split('/').at(-1),
-      address: ref.$actor,
+      id: actor?.id ?? ref['@actor'].split('/').at(-1),
+      address: ref['@actor'],
       sessionId: ref.incarnation,
       options: {
         _inert: true,
@@ -2390,13 +2402,13 @@ class SystemReduction {
       _unregister: actor => {
         this.stopping.add(JSON.stringify(this.reference(actor)));
         for (const [key, ref] of Object.entries(this.snapshot.registry)) {
-          if (ref.$actor === actor.address && ref.incarnation === actor.sessionId) delete this.snapshot.registry[key];
+          if (ref['@actor'] === actor.address && ref.incarnation === actor.sessionId) delete this.snapshot.registry[key];
         }
       },
       _getByAddress: address => {
         const actor = this.snapshot.actors[address];
         return actor?.snapshot.status === 'active' ? this.handle({
-          $actor: address,
+          '@actor': address,
           incarnation: actor.incarnation
         }) : undefined;
       },
@@ -2442,11 +2454,11 @@ class SystemReduction {
     if (!definition) throw new Error('Register dynamically spawned logic in systemLogic.actors.');
     const parent = options.parent && this.reference(options.parent);
     const id = options.id ?? `${getActorIdPrefix(options.src ?? logic)}:${this.snapshot.counters.actor}`;
-    const address = `${parent ? parent.$actor + '/' : ''}${encodeAddressSegment(id)}`;
+    const address = `${parent ? parent['@actor'] + '/' : ''}${encodeAddressSegment(id)}`;
     const occupied = this.snapshot.actors[address];
     if (occupied?.snapshot.status === 'active') {
       const previous = {
-        $actor: address,
+        '@actor': address,
         incarnation: occupied.incarnation
       };
       if (!this.stopping.has(JSON.stringify(previous))) throw new Error(`Actor address '${address}' is already occupied.`);
@@ -2454,7 +2466,7 @@ class SystemReduction {
     }
     const incarnation = String(this.snapshot.counters.actor++);
     const ref = {
-      $actor: address,
+      '@actor': address,
       incarnation
     };
     const state = {
@@ -2492,7 +2504,7 @@ class SystemReduction {
     const actor = this.current(ref);
     if (!actor) return;
     this.snapshots.set(JSON.stringify(ref), snapshot);
-    this.snapshot.actors[ref.$actor] = {
+    this.snapshot.actors[ref['@actor']] = {
       ...actor,
       snapshot: snapshotData(snapshot, this.mapperNames)
     };
@@ -2542,7 +2554,7 @@ class SystemReduction {
       ...key
     });
     for (const [timerKey, timer] of Object.entries(this.snapshot.timers)) {
-      if (timer.source.$actor === ref.$actor && timer.source.incarnation === ref.incarnation && (cancelled === undefined || timerKey === cancelled)) delete this.snapshot.timers[timerKey];
+      if (timer.source['@actor'] === ref['@actor'] && timer.source.incarnation === ref.incarnation && (cancelled === undefined || timerKey === cancelled)) delete this.snapshot.timers[timerKey];
     }
   }
   effectsFor(ref, effects) {
@@ -2580,9 +2592,9 @@ class SystemReduction {
             } else if (isSerializedActorRef(value.target)) {
               // A ref that went through JSON targets the current incarnation
               // at its address; without one the event is a dead letter.
-              const target = this.snapshot.actors[value.target.$actor];
+              const target = this.snapshot.actors[value.target['@actor']];
               if (target?.snapshot.status === 'active' && (value.target.incarnation === undefined || value.target.incarnation === target.incarnation)) this.enqueue(ref, {
-                $actor: target.address,
+                '@actor': target.address,
                 incarnation: target.incarnation
               }, value.event);else this.external(ref, {
                 kind: 'builtin',
@@ -2622,7 +2634,7 @@ class SystemReduction {
   start(ref) {
     const actor = this.current(ref);
     if (!actor || actor.started || actor.snapshot.status === 'stopped') return;
-    this.snapshot.actors[ref.$actor] = {
+    this.snapshot.actors[ref['@actor']] = {
       ...actor,
       started: true
     };
@@ -2662,13 +2674,13 @@ class SystemReduction {
     });
     this.cancel(ref);
     this.handle(ref).system._unregister(this.handle(ref));
-    this.snapshot.messages = this.snapshot.messages.filter(message => message.target.$actor !== ref.$actor || message.target.incarnation !== ref.incarnation);
+    this.snapshot.messages = this.snapshot.messages.filter(message => message.target['@actor'] !== ref['@actor'] || message.target.incarnation !== ref.incarnation);
     this.cancelExternal(ref);
     this.stopAttachments(ref);
   }
   cancelExternal(ref) {
     for (const [id, effect] of Object.entries(this.snapshot.externalEffects)) {
-      if (effect.kind !== 'action' || effect.type === '@xstate.cancelEffect' || effect.type === '@xstate.cleanup' || effect.source.$actor !== ref.$actor || effect.source.incarnation !== ref.incarnation) continue;
+      if (effect.kind !== 'action' || effect.type === '@xstate.cancelEffect' || effect.type === '@xstate.cleanup' || effect.source['@actor'] !== ref['@actor'] || effect.source.incarnation !== ref.incarnation) continue;
       delete this.snapshot.externalEffects[id];
       const cancellation = {
         id: `${this.snapshot.executionId}:${this.snapshot.counters.effect++}`,
@@ -2705,7 +2717,7 @@ class SystemReduction {
     }
     const logic = this.logic.get(actor.src);
     if (!logic) throw new Error(`Missing actor definition '${actor.src}'.`);
-    if (logic.isInternalEventType?.(message.event.type) && (!message.source || message.source.$actor !== actor.address || message.source.incarnation !== actor.incarnation)) {
+    if (logic.isInternalEventType?.(message.event.type) && (!message.source || message.source['@actor'] !== actor.address || message.source.incarnation !== actor.incarnation)) {
       throw new Error(`Internal event '${message.event.type}' cannot be injected into a pure system.`);
     }
     if (!message.source && /^(xstate\.after(?:\.|$)|xstate\.timeout(?:\.|$))/.test(message.event.type)) throw new Error('Select a pending timer instead of injecting its internal event.');
@@ -2762,7 +2774,7 @@ class SystemReduction {
     if (event.type === 'xstate.timer') {
       const actor = this.snapshot.actors[path];
       if (!actor) throw new Error(`Unknown actor address '${path}'.`);
-      const timer = Object.values(this.snapshot.timers).find(pending => pending.source.$actor === path && pending.source.incarnation === actor.incarnation && pending.occurrence === event.occurrence);
+      const timer = Object.values(this.snapshot.timers).find(pending => pending.source['@actor'] === path && pending.source.incarnation === actor.incarnation && pending.occurrence === event.occurrence);
       if (!timer) throw new Error('Select a current timer occurrence.');
       this.advance(timer.dueAt);
       return;
@@ -2771,12 +2783,12 @@ class SystemReduction {
     const actor = this.snapshot.actors[path];
     if (!actor) throw new Error(`Unknown actor address '${path}'.`);
     const ref = {
-      $actor: path,
+      '@actor': path,
       incarnation: actor.incarnation
     };
     if (event.type === 'xstate.system.effect.result') {
       const effect = this.snapshot.externalEffects[event.effectId];
-      if (!effect || effect.source.$actor !== path || event.event && (effect.source.incarnation !== actor.incarnation || actor.snapshot.status !== 'active' || effect.type === '@xstate.cancelEffect' || effect.type === '@xstate.cleanup')) throw new Error('External effect result does not match its owner or is stale.');
+      if (!effect || effect.source['@actor'] !== path || event.event && (effect.source.incarnation !== actor.incarnation || actor.snapshot.status !== 'active' || effect.type === '@xstate.cancelEffect' || effect.type === '@xstate.cleanup')) throw new Error('External effect result does not match its owner or is stale.');
       delete this.snapshot.externalEffects[event.effectId];
       if (event.event) {
         this.enqueue(ref, ref, event.event);