jotai-state-tree 1.3.5 → 1.3.7

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { I as ISimpleType, a as IType, b as IIdentifierType, c as IIdentifierNumberType, d as ILiteralType, e as IEnumerationType, f as IFrozenType, M as ModelProperties, g as IModelType, h as MixinConfig, i as IMixin, j as IAnyType, k as IArrayType, l as IMapType, m as IOptionalType, n as IMaybeType, o as IMaybeNullType, p as IUnionType, U as UnionOptions, q as ILateType, r as IAnyModelType, R as ReferenceOptions, s as IReferenceType, t as ISafeReferenceType, u as IRefinementType, v as IDisposer, S as SnapshotIn, w as Instance, x as IReversibleJsonPatch } from './tree-BMaFqD3f.mjs';
-export { L as CustomTypeOptions, D as IAnyComplexType, E as IAnyMixin, G as IJsonPatch, z as IMSTArray, A as IMSTMap, y as IStateTreeNode, H as IValidationContext, K as IValidationError, J as IValidationResult, B as ModelInstance, F as ModelSelf, C as SnapshotOut, T as applyPatch, O as applySnapshot, aw as cleanupStaleEntries, ax as clearAllRegistries, aa as clone, aq as cloneDeep, a8 as destroy, a9 as detach, am as findAll, an as findFirst, as as freeze, a2 as getEnv, ag as getGlobalStore, a4 as getIdentifier, af as getMembers, ar as getOrCreatePath, Y as getParent, $ as getParentOfType, a0 as getPath, a1 as getPathParts, av as getRegistryStats, aj as getRelativePath, X as getRoot, N as getSnapshot, ap as getTreeStats, a3 as getType, _ as hasParent, al as haveSameRoot, a5 as isAlive, ak as isAncestor, at as isFrozen, a6 as isRoot, a7 as isStateTreeNode, ao as isValidReference, W as onAction, ay as onLifecycleChange, Q as onPatch, P as onSnapshot, V as recordPatches, ai as resetGlobalStore, ae as resolveIdentifier, ac as resolvePath, ah as setGlobalStore, Z as tryGetParent, ad as tryResolve, au as unfreeze, ab as walk } from './tree-BMaFqD3f.mjs';
+import { I as ISimpleType, a as IType, b as IIdentifierType, c as IIdentifierNumberType, d as ILiteralType, e as IEnumerationType, f as IFrozenType, M as ModelProperties, g as IModelType, h as MixinConfig, i as IMixin, j as IAnyType, k as IArrayType, l as IMapType, m as IOptionalType, n as IMaybeType, o as IMaybeNullType, p as IUnionType, U as UnionOptions, q as ILateType, r as IAnyModelType, R as ReferenceOptions, s as IReferenceType, t as ISafeReferenceType, u as IRefinementType, v as IDisposer, S as SnapshotIn, w as Instance, x as IReversibleJsonPatch } from './tree-C2ADWEka.mjs';
+export { L as CustomTypeOptions, D as IAnyComplexType, E as IAnyMixin, G as IJsonPatch, z as IMSTArray, A as IMSTMap, y as IStateTreeNode, H as IValidationContext, K as IValidationError, J as IValidationResult, B as ModelInstance, F as ModelSelf, C as SnapshotOut, T as applyPatch, O as applySnapshot, aw as cleanupStaleEntries, ax as clearAllRegistries, aa as clone, aq as cloneDeep, a8 as destroy, a9 as detach, am as findAll, an as findFirst, as as freeze, a2 as getEnv, ag as getGlobalStore, a4 as getIdentifier, af as getMembers, ar as getOrCreatePath, Y as getParent, $ as getParentOfType, a0 as getPath, a1 as getPathParts, av as getRegistryStats, aj as getRelativePath, X as getRoot, N as getSnapshot, ap as getTreeStats, a3 as getType, _ as hasParent, al as haveSameRoot, a5 as isAlive, ak as isAncestor, at as isFrozen, a6 as isRoot, a7 as isStateTreeNode, ao as isValidReference, W as onAction, ay as onLifecycleChange, Q as onPatch, P as onSnapshot, V as recordPatches, ai as resetGlobalStore, ae as resolveIdentifier, ac as resolvePath, ah as setGlobalStore, Z as tryGetParent, ad as tryResolve, au as unfreeze, ab as walk } from './tree-C2ADWEka.mjs';
 import 'jotai/vanilla/internals';
 import 'jotai';
 

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { I as ISimpleType, a as IType, b as IIdentifierType, c as IIdentifierNumberType, d as ILiteralType, e as IEnumerationType, f as IFrozenType, M as ModelProperties, g as IModelType, h as MixinConfig, i as IMixin, j as IAnyType, k as IArrayType, l as IMapType, m as IOptionalType, n as IMaybeType, o as IMaybeNullType, p as IUnionType, U as UnionOptions, q as ILateType, r as IAnyModelType, R as ReferenceOptions, s as IReferenceType, t as ISafeReferenceType, u as IRefinementType, v as IDisposer, S as SnapshotIn, w as Instance, x as IReversibleJsonPatch } from './tree-BMaFqD3f.js';
-export { L as CustomTypeOptions, D as IAnyComplexType, E as IAnyMixin, G as IJsonPatch, z as IMSTArray, A as IMSTMap, y as IStateTreeNode, H as IValidationContext, K as IValidationError, J as IValidationResult, B as ModelInstance, F as ModelSelf, C as SnapshotOut, T as applyPatch, O as applySnapshot, aw as cleanupStaleEntries, ax as clearAllRegistries, aa as clone, aq as cloneDeep, a8 as destroy, a9 as detach, am as findAll, an as findFirst, as as freeze, a2 as getEnv, ag as getGlobalStore, a4 as getIdentifier, af as getMembers, ar as getOrCreatePath, Y as getParent, $ as getParentOfType, a0 as getPath, a1 as getPathParts, av as getRegistryStats, aj as getRelativePath, X as getRoot, N as getSnapshot, ap as getTreeStats, a3 as getType, _ as hasParent, al as haveSameRoot, a5 as isAlive, ak as isAncestor, at as isFrozen, a6 as isRoot, a7 as isStateTreeNode, ao as isValidReference, W as onAction, ay as onLifecycleChange, Q as onPatch, P as onSnapshot, V as recordPatches, ai as resetGlobalStore, ae as resolveIdentifier, ac as resolvePath, ah as setGlobalStore, Z as tryGetParent, ad as tryResolve, au as unfreeze, ab as walk } from './tree-BMaFqD3f.js';
+import { I as ISimpleType, a as IType, b as IIdentifierType, c as IIdentifierNumberType, d as ILiteralType, e as IEnumerationType, f as IFrozenType, M as ModelProperties, g as IModelType, h as MixinConfig, i as IMixin, j as IAnyType, k as IArrayType, l as IMapType, m as IOptionalType, n as IMaybeType, o as IMaybeNullType, p as IUnionType, U as UnionOptions, q as ILateType, r as IAnyModelType, R as ReferenceOptions, s as IReferenceType, t as ISafeReferenceType, u as IRefinementType, v as IDisposer, S as SnapshotIn, w as Instance, x as IReversibleJsonPatch } from './tree-C2ADWEka.js';
+export { L as CustomTypeOptions, D as IAnyComplexType, E as IAnyMixin, G as IJsonPatch, z as IMSTArray, A as IMSTMap, y as IStateTreeNode, H as IValidationContext, K as IValidationError, J as IValidationResult, B as ModelInstance, F as ModelSelf, C as SnapshotOut, T as applyPatch, O as applySnapshot, aw as cleanupStaleEntries, ax as clearAllRegistries, aa as clone, aq as cloneDeep, a8 as destroy, a9 as detach, am as findAll, an as findFirst, as as freeze, a2 as getEnv, ag as getGlobalStore, a4 as getIdentifier, af as getMembers, ar as getOrCreatePath, Y as getParent, $ as getParentOfType, a0 as getPath, a1 as getPathParts, av as getRegistryStats, aj as getRelativePath, X as getRoot, N as getSnapshot, ap as getTreeStats, a3 as getType, _ as hasParent, al as haveSameRoot, a5 as isAlive, ak as isAncestor, at as isFrozen, a6 as isRoot, a7 as isStateTreeNode, ao as isValidReference, W as onAction, ay as onLifecycleChange, Q as onPatch, P as onSnapshot, V as recordPatches, ai as resetGlobalStore, ae as resolveIdentifier, ac as resolvePath, ah as setGlobalStore, Z as tryGetParent, ad as tryResolve, au as unfreeze, ab as walk } from './tree-C2ADWEka.js';
 import 'jotai/vanilla/internals';
 import 'jotai';
 

package/dist/index.js

@@ -565,11 +565,11 @@ var StateTreeNode = class {
       return;
     }
     globalStore.set(this.valueAtom, value);
+    this.notifySnapshotChange();
     this.notifyPatch(
       { op: "replace", path: this.$path, value },
       { op: "replace", path: this.$path, value: oldValue, oldValue }
     );
-    this.notifySnapshotChange();
   }
   /** Add a child node */
   addChild(key, child) {
@@ -671,11 +671,11 @@ var StateTreeNode = class {
   /** Notify about a property change (for use by model proxy) */
   notifyPropertyChange(propName, newValue, oldValue) {
     const path = this.$path ? `${this.$path}/${propName}` : `/${propName}`;
+    this.notifySnapshotChange();
     this.notifyPatch(
       { op: "replace", path, value: newValue },
       { op: "replace", path, value: oldValue, oldValue }
     );
-    this.notifySnapshotChange();
   }
   /** Notify about a volatile state change (triggers snapshot listeners without patches) */
   notifyVolatileChange() {
@@ -2581,7 +2581,7 @@ var MSTArray = class _MSTArray extends Array {
     }
     const store = getGlobalStore();
     store.set(this.node.valueAtom, newArray);
-    this.node.invalidateSnapshot();
+    this.node.notifySnapshotChange();
     patches.forEach((patch, idx) => {
       this.node.notifyPatch(patch, reversePatches[idx]);
     });
@@ -3871,6 +3871,9 @@ var TimeTravelManager = class {
     this.index = -1;
     this.isApplying = false;
     this.disposer = null;
+    this.actionDisposer = null;
+    this.pendingRecord = false;
+    this.actionGrouping = false;
     this.target = target;
     this.maxSnapshots = options.maxSnapshots ?? 50;
     this.autoRecord = options.autoRecord ?? false;
@@ -3882,8 +3885,35 @@ var TimeTravelManager = class {
         if (node.getRoot().$isApplyingHistory) {
           return;
         }
-        this.record();
+        if (isActionRunning()) {
+          this.pendingRecord = true;
+          if (!this.actionGrouping) {
+            this.actionGrouping = true;
+            Promise.resolve().then(() => {
+              if (this.actionGrouping) {
+                this.commitPendingRecord();
+              }
+            });
+          }
+        } else {
+          this.record();
+        }
       });
+      this.actionDisposer = onAction(target, () => {
+        const current = getCurrentAction();
+        if (current && !current.parent) {
+          if (this.actionGrouping) {
+            this.commitPendingRecord();
+          }
+        }
+      });
+    }
+  }
+  commitPendingRecord() {
+    this.actionGrouping = false;
+    if (this.pendingRecord) {
+      this.pendingRecord = false;
+      this.record();
     }
   }
   get currentIndex() {
@@ -3949,6 +3979,10 @@ var TimeTravelManager = class {
       this.disposer();
       this.disposer = null;
     }
+    if (this.actionDisposer) {
+      this.actionDisposer();
+      this.actionDisposer = null;
+    }
   }
 };
 function createTimeTravelManager(target, options) {

package/dist/index.mjs

@@ -59,7 +59,7 @@ import {
   tryResolve,
   unfreeze,
   walk
-} from "./chunk-E6MXYAAH.mjs";
+} from "./chunk-K2MLK6B7.mjs";
 
 // src/primitives.ts
 function createSimpleType(name, validator, defaultValue) {
@@ -1590,7 +1590,7 @@ var MSTArray = class _MSTArray extends Array {
     }
     const store = getGlobalStore();
     store.set(this.node.valueAtom, newArray);
-    this.node.invalidateSnapshot();
+    this.node.notifySnapshotChange();
     patches.forEach((patch, idx) => {
       this.node.notifyPatch(patch, reversePatches[idx]);
     });
@@ -2880,6 +2880,9 @@ var TimeTravelManager = class {
     this.index = -1;
     this.isApplying = false;
     this.disposer = null;
+    this.actionDisposer = null;
+    this.pendingRecord = false;
+    this.actionGrouping = false;
     this.target = target;
     this.maxSnapshots = options.maxSnapshots ?? 50;
     this.autoRecord = options.autoRecord ?? false;
@@ -2891,8 +2894,35 @@ var TimeTravelManager = class {
         if (node.getRoot().$isApplyingHistory) {
           return;
         }
-        this.record();
+        if (isActionRunning()) {
+          this.pendingRecord = true;
+          if (!this.actionGrouping) {
+            this.actionGrouping = true;
+            Promise.resolve().then(() => {
+              if (this.actionGrouping) {
+                this.commitPendingRecord();
+              }
+            });
+          }
+        } else {
+          this.record();
+        }
       });
+      this.actionDisposer = onAction(target, () => {
+        const current = getCurrentAction();
+        if (current && !current.parent) {
+          if (this.actionGrouping) {
+            this.commitPendingRecord();
+          }
+        }
+      });
+    }
+  }
+  commitPendingRecord() {
+    this.actionGrouping = false;
+    if (this.pendingRecord) {
+      this.pendingRecord = false;
+      this.record();
     }
   }
   get currentIndex() {
@@ -2958,6 +2988,10 @@ var TimeTravelManager = class {
       this.disposer();
       this.disposer = null;
     }
+    if (this.actionDisposer) {
+      this.actionDisposer();
+      this.actionDisposer = null;
+    }
   }
 };
 function createTimeTravelManager(target, options) {

package/dist/react.d.mts

@@ -1,6 +1,6 @@
 import React, { ComponentType, FC, ReactNode } from 'react';
-import { ag as getGlobalStore } from './tree-BMaFqD3f.mjs';
-export { az as hasStateTreeNode } from './tree-BMaFqD3f.mjs';
+import { ag as getGlobalStore } from './tree-C2ADWEka.mjs';
+export { az as hasStateTreeNode } from './tree-C2ADWEka.mjs';
 import 'jotai/vanilla/internals';
 import 'jotai';
 

package/dist/react.d.ts

@@ -1,6 +1,6 @@
 import React, { ComponentType, FC, ReactNode } from 'react';
-import { ag as getGlobalStore } from './tree-BMaFqD3f.js';
-export { az as hasStateTreeNode } from './tree-BMaFqD3f.js';
+import { ag as getGlobalStore } from './tree-C2ADWEka.js';
+export { az as hasStateTreeNode } from './tree-C2ADWEka.js';
 import 'jotai/vanilla/internals';
 import 'jotai';
 

package/dist/react.js

@@ -176,11 +176,11 @@ var StateTreeNode = class {
       return;
     }
     globalStore.set(this.valueAtom, value);
+    this.notifySnapshotChange();
     this.notifyPatch(
       { op: "replace", path: this.$path, value },
       { op: "replace", path: this.$path, value: oldValue, oldValue }
     );
-    this.notifySnapshotChange();
   }
   /** Add a child node */
   addChild(key, child) {
@@ -282,11 +282,11 @@ var StateTreeNode = class {
   /** Notify about a property change (for use by model proxy) */
   notifyPropertyChange(propName, newValue, oldValue) {
     const path = this.$path ? `${this.$path}/${propName}` : `/${propName}`;
+    this.notifySnapshotChange();
     this.notifyPatch(
       { op: "replace", path, value: newValue },
       { op: "replace", path, value: oldValue, oldValue }
     );
-    this.notifySnapshotChange();
   }
   /** Notify about a volatile state change (triggers snapshot listeners without patches) */
   notifyVolatileChange() {

package/dist/react.mjs

@@ -9,7 +9,7 @@ import {
   onPatch,
   onSnapshot,
   setActiveTrackingFn
-} from "./chunk-E6MXYAAH.mjs";
+} from "./chunk-K2MLK6B7.mjs";
 
 // src/react.ts
 import React, {

package/dist/{tree-BMaFqD3f.d.mts → tree-C2ADWEka.d.mts}

@@ -379,7 +379,7 @@ declare class StateTreeNode implements IStateTreeNode {
     /** Notify patch listeners */
     notifyPatch(patch: IJsonPatch, reversePatch: IReversibleJsonPatch): void;
     /** Notify snapshot listeners */
-    private notifySnapshotChange;
+    notifySnapshotChange(): void;
     /** Notify about a property change (for use by model proxy) */
     notifyPropertyChange(propName: string, newValue: unknown, oldValue: unknown): void;
     /** Notify about a volatile state change (triggers snapshot listeners without patches) */

package/dist/{tree-BMaFqD3f.d.ts → tree-C2ADWEka.d.ts}

@@ -379,7 +379,7 @@ declare class StateTreeNode implements IStateTreeNode {
     /** Notify patch listeners */
     notifyPatch(patch: IJsonPatch, reversePatch: IReversibleJsonPatch): void;
     /** Notify snapshot listeners */
-    private notifySnapshotChange;
+    notifySnapshotChange(): void;
     /** Notify about a property change (for use by model proxy) */
     notifyPropertyChange(propName: string, newValue: unknown, oldValue: unknown): void;
     /** Notify about a volatile state change (triggers snapshot listeners without patches) */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jotai-state-tree",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "description": "MobX-State-Tree API compatible library powered by Jotai",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/src/__tests__/history_repro.test.ts

@@ -0,0 +1,100 @@
+import { describe, it, expect } from 'vitest';
+import { types, getSnapshot, createUndoManager, createTimeTravelManager } from '../index';
+
+const Todo = types
+  .model('Todo', {
+    id: types.identifier,
+    title: types.string,
+    done: types.optional(types.boolean, false),
+  })
+  .actions((self) => ({
+    toggle() {
+      self.done = !self.done;
+    },
+    setTitle(title: string) {
+      self.title = title;
+    },
+  }));
+
+const TodoStore = types
+  .model('TodoStore', {
+    todos: types.optional(types.array(Todo), []),
+    filter: types.optional(types.string, 'all'),
+  })
+  .actions((self) => ({
+    addTodo(title: string) {
+      if (!title.trim()) return;
+      self.todos.push({
+        id: Math.random().toString(36).substring(2, 9),
+        title,
+        done: false,
+      });
+    },
+    removeTodo(id: string) {
+      const item = self.todos.find((t) => t.id === id);
+      if (item) {
+        self.todos.remove(item);
+      }
+    },
+    clearCompleted() {
+      const completed = self.todos.filter((t) => t.done);
+      completed.forEach((item) => self.todos.remove(item));
+    },
+  }));
+
+describe("Todo app history integration", () => {
+  it("should match todo example time travel flow with action grouping", () => {
+    const store = TodoStore.create({
+      todos: [
+        { id: '1', title: 'Learn jotai-state-tree', done: true },
+        { id: '2', title: 'Explore Vite templates', done: false },
+        { id: '3', title: 'Build clean minimalist UIs', done: false },
+      ]
+    });
+
+    const undoManager = createUndoManager(store, { maxHistoryLength: 50 });
+    const timeTravel = createTimeTravelManager(store, { maxSnapshots: 50, autoRecord: true });
+
+    expect(timeTravel.snapshotCount).toBe(1);
+    expect(timeTravel.currentIndex).toBe(0);
+
+    // 1. Add todo
+    store.addTodo("New Task");
+    expect(store.todos.length).toBe(4);
+    expect(timeTravel.snapshotCount).toBe(2);
+    expect(timeTravel.currentIndex).toBe(1);
+
+    // 2. Toggle todo done
+    const newTodo = store.todos[3];
+    newTodo.toggle();
+    expect(newTodo.done).toBe(true);
+    expect(timeTravel.snapshotCount).toBe(3);
+    expect(timeTravel.currentIndex).toBe(2);
+
+    // 3. Clear completed (which should remove Learn jotai-state-tree and New Task in a single action)
+    store.clearCompleted();
+    expect(store.todos.length).toBe(2);
+    // Should group the multiple removals in clearCompleted into a single snapshot update
+    expect(timeTravel.snapshotCount).toBe(4);
+    expect(timeTravel.currentIndex).toBe(3);
+
+    // 4. Undo clearCompleted
+    undoManager.undo();
+    expect(store.todos.length).toBe(4);
+    // Time travel should not have recorded new snapshots during undo
+    expect(timeTravel.snapshotCount).toBe(4);
+    expect(timeTravel.currentIndex).toBe(3);
+
+    // 5. Time travel back 2 steps
+    timeTravel.goBack(); // Back to state after toggle
+    expect(store.todos.length).toBe(4);
+    expect(store.todos[3].done).toBe(true);
+
+    timeTravel.goBack(); // Back to state after addTodo
+    expect(store.todos.length).toBe(4);
+    expect(store.todos[3].done).toBe(false);
+
+    undoManager.dispose();
+    timeTravel.dispose();
+  });
+});

package/src/__tests__/react.react.test.tsx

@@ -16,6 +16,8 @@ import {
   clearAllRegistries,
   resetGlobalStore,
   getRegistryStats,
+  createUndoManager,
+  createTimeTravelManager,
 } from "../index";
 
 import {
@@ -585,6 +587,54 @@ describe("React Integration", () => {
         expect(screen.getByTestId("snapshot").textContent).toBe("20");
       });
     });
+
+    it("should update when undo/redo or time travel are executed", async () => {
+      const counter = CounterModel.create({ count: 10 });
+      const undoManager = createUndoManager(counter);
+      const timeTravel = createTimeTravelManager(counter, { autoRecord: true });
+
+      function SnapshotDisplay({ store }: { store: typeof counter }) {
+        const snapshot = useSnapshot<{ count: number }>(store);
+        return <div data-testid="snapshot">{snapshot.count}</div>;
+      }
+
+      render(<SnapshotDisplay store={counter} />);
+      expect(screen.getByTestId("snapshot").textContent).toBe("10");
+
+      act(() => {
+        counter.setCount(20);
+      });
+      await waitFor(() => {
+        expect(screen.getByTestId("snapshot").textContent).toBe("20");
+      });
+
+      // Undo
+      act(() => {
+        undoManager.undo();
+      });
+      await waitFor(() => {
+        expect(screen.getByTestId("snapshot").textContent).toBe("10");
+      });
+
+      // Redo
+      act(() => {
+        undoManager.redo();
+      });
+      await waitFor(() => {
+        expect(screen.getByTestId("snapshot").textContent).toBe("20");
+      });
+
+      // Time travel goBack
+      act(() => {
+        timeTravel.goBack();
+      });
+      await waitFor(() => {
+        expect(screen.getByTestId("snapshot").textContent).toBe("10");
+      });
+
+      undoManager.dispose();
+      timeTravel.dispose();
+    });
   });
 
   // ============================================================================

package/src/array.ts

@@ -374,7 +374,7 @@ class MSTArray<T> extends Array<T> implements IMSTArray<T> {
     // Update the node's value silently
     const store = getGlobalStore();
     store.set(this.node.valueAtom, newArray);
-    this.node.invalidateSnapshot();
+    this.node.notifySnapshotChange();
 
     // Notify patch listeners
     patches.forEach((patch, idx) => {

package/src/tree.ts

@@ -285,14 +285,14 @@ export class StateTreeNode implements IStateTreeNode {
     }
     globalStore.set(this.valueAtom, value);
 
+    // Notify snapshot listeners (bubble up to root)
+    this.notifySnapshotChange();
+
     // Notify patch listeners
     this.notifyPatch(
       { op: "replace", path: this.$path, value },
       { op: "replace", path: this.$path, value: oldValue, oldValue },
     );
-
-    // Notify snapshot listeners (bubble up to root)
-    this.notifySnapshotChange();
   }
 
   /** Add a child node */
@@ -406,7 +406,7 @@ export class StateTreeNode implements IStateTreeNode {
   }
 
   /** Notify snapshot listeners */
-  private notifySnapshotChange() {
+  notifySnapshotChange() {
     let current: StateTreeNode | null = this;
     while (current) {
       current.invalidateSnapshot();
@@ -419,11 +419,11 @@ export class StateTreeNode implements IStateTreeNode {
   /** Notify about a property change (for use by model proxy) */
   notifyPropertyChange(propName: string, newValue: unknown, oldValue: unknown) {
     const path = this.$path ? `${this.$path}/${propName}` : `/${propName}`;
+    this.notifySnapshotChange();
     this.notifyPatch(
       { op: "replace", path, value: newValue },
       { op: "replace", path, value: oldValue, oldValue },
     );
-    this.notifySnapshotChange();
   }
 
   /** Notify about a volatile state change (triggers snapshot listeners without patches) */

package/src/undo.ts

@@ -360,7 +360,10 @@ class TimeTravelManager implements ITimeTravelManager {
   private maxSnapshots: number;
   private isApplying: boolean = false;
   private disposer: IDisposer | null = null;
+  private actionDisposer: IDisposer | null = null;
   private autoRecord: boolean;
+  private pendingRecord: boolean = false;
+  private actionGrouping: boolean = false;
 
   constructor(
     target: unknown,
@@ -384,11 +387,41 @@ class TimeTravelManager implements ITimeTravelManager {
         if (node.getRoot().$isApplyingHistory) {
           return;
         }
-        this.record();
+
+        if (isActionRunning()) {
+          this.pendingRecord = true;
+          if (!this.actionGrouping) {
+            this.actionGrouping = true;
+            Promise.resolve().then(() => {
+              if (this.actionGrouping) {
+                this.commitPendingRecord();
+              }
+            });
+          }
+        } else {
+          this.record();
+        }
+      });
+
+      this.actionDisposer = onAction(target, () => {
+        const current = getCurrentAction();
+        if (current && !current.parent) {
+          if (this.actionGrouping) {
+            this.commitPendingRecord();
+          }
+        }
       });
     }
   }
 
+  private commitPendingRecord() {
+    this.actionGrouping = false;
+    if (this.pendingRecord) {
+      this.pendingRecord = false;
+      this.record();
+    }
+  }
+
   get currentIndex(): number {
     return this.index;
   }
@@ -469,6 +502,10 @@ class TimeTravelManager implements ITimeTravelManager {
       this.disposer();
       this.disposer = null;
     }
+    if (this.actionDisposer) {
+      this.actionDisposer();
+      this.actionDisposer = null;
+    }
   }
 }
 

package/dist/{chunk-E6MXYAAH.mjs → chunk-K2MLK6B7.mjs}

@@ -134,11 +134,11 @@ var StateTreeNode = class {
       return;
     }
     globalStore.set(this.valueAtom, value);
+    this.notifySnapshotChange();
     this.notifyPatch(
       { op: "replace", path: this.$path, value },
       { op: "replace", path: this.$path, value: oldValue, oldValue }
     );
-    this.notifySnapshotChange();
   }
   /** Add a child node */
   addChild(key, child) {
@@ -240,11 +240,11 @@ var StateTreeNode = class {
   /** Notify about a property change (for use by model proxy) */
   notifyPropertyChange(propName, newValue, oldValue) {
     const path = this.$path ? `${this.$path}/${propName}` : `/${propName}`;
+    this.notifySnapshotChange();
     this.notifyPatch(
       { op: "replace", path, value: newValue },
       { op: "replace", path, value: oldValue, oldValue }
     );
-    this.notifySnapshotChange();
   }
   /** Notify about a volatile state change (triggers snapshot listeners without patches) */
   notifyVolatileChange() {