@designcrowd/library.brand-page 5.18.1-undo-33 → 5.18.1-undo-34

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@designcrowd/library.brand-page",
   "description": "A collection of Maker/Designer applications",
-  "version": "5.18.1-undo-33",
+  "version": "5.18.1-undo-34",
   "author": "Design.com Eng",
   "license": "UNLICENSED",
   "type": "module",

package/src/brand-page-maker/stores/history/history-store.test.ts

@@ -357,6 +357,38 @@ describe('history-store (single stack + JSON-string snapshots)', () => {
       expect(store.currentIndex).toBe(2);
     });
 
+    it('drops a stale merge arm if no mutation follows in the same tick', async () => {
+      // Repro for the "first pre-purchase logo edit not captured" bug:
+      // a hydration site (e.g. ContentSettings.mounted on tab switch)
+      // armed the flag, but the user navigated away before the flagged
+      // write happened. A LATER unrelated mutation must NOT inherit
+      // the stale arm and merge — it must commit normally.
+      const store = useHistoryStore();
+
+      await store.captureBaseline();
+      await elapseSettleWindow();
+
+      // Land a real entry first.
+      liveData.v = 100;
+      await flushWatcher();
+
+      expect(store.entries.length).toBe(2);
+
+      // Hydration site arms the flag, but no mutation follows in the
+      // same tick — caller navigated away.
+      store.mergeNextMutation();
+      // Advance past the macrotask cleanup, no mutation in between.
+      await vi.advanceTimersByTimeAsync(10);
+
+      // Some time later, a real edit happens.
+      liveData.unrelated = 'edit';
+      await flushWatcher();
+
+      // Must push, not merge.
+      expect(store.entries.length).toBe(3);
+      expect(store.currentIndex).toBe(2);
+    });
+
     it('clears any armed merge flag during snapshot apply (undo/redo)', async () => {
       const store = useHistoryStore();
 

package/src/brand-page-maker/stores/history/history-store.ts

@@ -153,13 +153,19 @@ export const useHistoryStore = defineStore('history', () => {
     }
   }
 
-  // One-shot flag set by hydration write sites (TipTap mount, lazy
-  // paymentConfig fill, stale-page-ref clear, ContentSettings RTE
-  // rewrap) before their imperative write. The watcher's next flush
-  // consumes the flag and merges the snapshot into the current head
-  // instead of pushing — preventing phantom undo entries on first
-  // sidebar open / section click. Cleared on apply and reset.
-  const mergeNextFlush = ref(false);
+  // Two-phase merge flag. Hydration write sites call `mergeNextMutation()`
+  // immediately before their imperative write, which sets `mergeArmed`.
+  // When the watcher's `scheduleAutoCapture` arms a new idle timer, it
+  // transfers `mergeArmed` into `pendingTimerIsMerge`. The flush then
+  // consumes `pendingTimerIsMerge` and merges into the current head
+  // instead of pushing.
+  //
+  // The microtask cleanup on `mergeArmed` prevents stale flags surviving
+  // when the user navigates away (e.g. sidebar tab switch) before the
+  // flagged write actually happens — a previously-set arm is dropped
+  // synchronously after the current tick if no watcher fired.
+  const mergeArmed = ref(false);
+  let pendingTimerIsMerge = false;
 
   // Returns 'noop' when no-change vs current head, 'oversized' when over
   // MAX_ENTRY_BYTES, else 'committed'. Truncates the redo tail, caps at
@@ -286,11 +292,12 @@ export const useHistoryStore = defineStore('history', () => {
         currentIndex.value === 0 &&
         Date.now() - baselineCapturedAt < BASELINE_SETTLE_MS;
 
-      // Merge: a hydration write site flagged this flush — replace the
-      // current head in place instead of pushing. Consumed once.
-      const shouldMerge = mergeNextFlush.value;
+      // Merge: the timer that fired this flush was armed during a
+      // hydration burst — replace the current head in place instead of
+      // pushing. Consumed once.
+      const shouldMerge = pendingTimerIsMerge;
 
-      mergeNextFlush.value = false;
+      pendingTimerIsMerge = false;
 
       if (inSettleWindow) {
         entries.value = [
@@ -334,12 +341,20 @@ export const useHistoryStore = defineStore('history', () => {
 
     // Monotonic — first mutation arms; subsequent ones inside the window
     // don't reset. Gated on isApplyingSnapshot so undo/redo don't leave
-    // a stale timer ticking.
+    // a stale timer ticking. If a hydration site armed `mergeArmed`
+    // immediately before the mutation that triggered this run, transfer
+    // the intent into `pendingTimerIsMerge` so the resulting flush
+    // merges instead of commits.
     const scheduleAutoCapture = (): void => {
       if (isApplyingSnapshot.value) return;
 
       if (idleTimerId !== null) return;
 
+      if (mergeArmed.value) {
+        pendingTimerIsMerge = true;
+        mergeArmed.value = false;
+      }
+
       idleTimerId = setTimeout(flush, CAPTURE_DEBOUNCE_MS);
       maxWaitTimerId = setTimeout(flush, CAPTURE_MAX_WAIT_MS);
     };
@@ -491,9 +506,10 @@ export const useHistoryStore = defineStore('history', () => {
     const targetEntry = entries.value[targetIndex];
 
     isApplyingSnapshot.value = true;
-    // Clear any unconsumed merge flag — a stale flag would fold the
+    // Clear any unconsumed merge intent — a stale flag would fold the
     // post-apply tick into the restored entry and erase the redo.
-    mergeNextFlush.value = false;
+    mergeArmed.value = false;
+    pendingTimerIsMerge = false;
     cancelPendingAutoCapture();
 
     try {
@@ -568,7 +584,8 @@ export const useHistoryStore = defineStore('history', () => {
     if (!baselineCaptured.value) return;
 
     cancelPendingAutoCapture();
-    mergeNextFlush.value = false;
+    mergeArmed.value = false;
+    pendingTimerIsMerge = false;
 
     entries.value = [];
     currentIndex.value = -1;
@@ -579,10 +596,23 @@ export const useHistoryStore = defineStore('history', () => {
   }
 
   // Hydration write sites call this immediately before their imperative
-  // mutation; the next watcher flush merges into the current head
-  // instead of pushing. Idempotent and one-shot.
+  // mutation. The arm is auto-cleared on the next Vue tick — `nextTick`
+  // runs AFTER all queued reactive effects (including the watcher), so
+  // if the hydration write triggered `scheduleAutoCapture`, the arm has
+  // already been transferred into `pendingTimerIsMerge` before this
+  // cleanup fires. If no mutation followed (e.g. the user navigated
+  // away before the flagged write), the cleanup drops the stale arm so
+  // it can't be consumed by an unrelated future mutation.
   function mergeNextMutation(): void {
-    mergeNextFlush.value = true;
+    mergeArmed.value = true;
+    // setTimeout(0) is a macrotask — runs AFTER the synchronous write
+    // and AFTER Vue's microtask flush of the watcher's reactive effect.
+    // If `scheduleAutoCapture` fired in between (the imperative write
+    // triggered the watcher), the arm has already been transferred into
+    // `pendingTimerIsMerge` before this cleanup runs.
+    setTimeout(() => {
+      mergeArmed.value = false;
+    }, 0);
   }
 
   // --- Instrumentation (NFR-04a) ---