@hyperframes/studio 0.8.123 → 0.8.125

package/src/hooks/gestureTransaction.test.ts

@@ -281,6 +281,66 @@ describe("runGestureTransaction", () => {
     log.mockRestore();
   });
 
+  it("measures a box undo painted back mid-save as the edit drew it, so it reports no change", async () => {
+    const element = document.createElement("div");
+    let undone = false;
+    vi.spyOn(element, "getBoundingClientRect").mockImplementation(() =>
+      undone ? rect(0, 0, 50, 40) : rect(10, 20, 100, 80),
+    );
+    const draw = <T>(run: () => T): T => {
+      undone = false;
+      try {
+        return run();
+      } finally {
+        undone = true;
+      }
+    };
+
+    await runGestureTransaction({
+      element,
+      label: "Resize layer",
+      settle: vi.fn(),
+      persist: async () => void (undone = true),
+      restore: vi.fn(),
+      draw,
+    });
+
+    expect(trackStudioEventMock).not.toHaveBeenCalledWith(
+      "commit_invariant_violation",
+      expect.anything(),
+    );
+  });
+
+  it("measures as the edit drew it when undo painted the box back before the transaction began", async () => {
+    const element = document.createElement("div");
+    let undone = true;
+    vi.spyOn(element, "getBoundingClientRect").mockImplementation(() =>
+      undone ? rect(0, 0, 50, 40) : rect(10, 20, 100, 80),
+    );
+    const draw = <T>(run: () => T): T => {
+      undone = false;
+      try {
+        return run();
+      } finally {
+        undone = true;
+      }
+    };
+
+    await runGestureTransaction({
+      element,
+      label: "Resize layer",
+      settle: vi.fn(),
+      persist: async () => undefined,
+      restore: vi.fn(),
+      draw,
+    });
+
+    expect(trackStudioEventMock).not.toHaveBeenCalledWith(
+      "commit_invariant_violation",
+      expect.anything(),
+    );
+  });
+
   it("skips the pixel assertion for live position tweens", async () => {
     const element = document.createElement("div");
     const getRect = vi.spyOn(element, "getBoundingClientRect");

package/src/hooks/gestureTransaction.ts

@@ -18,6 +18,7 @@ export interface GestureTransaction {
   afterBufferedCommitsSaved?(): Promise<void>;
   restore(): void;
   skipPixelAssert?: boolean;
+  draw?<T>(run: () => T): T;
 }
 
 let transactionCounter = 0;
@@ -126,7 +127,9 @@ export function runGestureTransaction(tx: GestureTransaction): Promise<void> {
   tx.settle();
   logCommit("settled", { label: tx.label, coalesceKey });
 
-  const before = !tx.skipPixelAssert ? readPixelRect(tx.element) : null;
+  const measure = () =>
+    tx.draw ? tx.draw(() => readPixelRect(tx.element)) : readPixelRect(tx.element);
+  const before = !tx.skipPixelAssert ? measure() : null;
   const commit: TxCommit = (commitMutation) => {
     const wrapped: CommitMutation = (selection, mutation, options) => {
       mutationCount += 1;
@@ -150,7 +153,7 @@ export function runGestureTransaction(tx: GestureTransaction): Promise<void> {
       const durationMs = Math.round(performance.now() - startedAt);
       logCommit("persisted", { label: tx.label, coalesceKey });
       if (before) {
-        const after = readPixelRect(tx.element);
+        const after = measure();
         const delta = pixelDelta(before, after);
         if (exceedsPixelTolerance(delta)) {
           logCommit("persist-changed-pixels", { label: tx.label, before, after, delta });

package/src/hooks/gsapGestureOutcome.ts

@@ -12,8 +12,11 @@ import {
   type KeyframeUsageAction,
 } from "../utils/keyframeUsage";
 import type { GeometryCommitResult } from "../utils/previewFeatureUsage";
+import { adoptingStudioPendingEdit } from "../utils/studioPendingEdits";
 
 export function observeGsapGesture(writer: CommitMutation | null) {
+  const edit = adoptingStudioPendingEdit();
+  const join = <T>(run: () => T): T => (edit ? edit.within(run) : run());
   let changed = false;
   let pendingResults = 0;
   const actions = new Set<KeyframeUsageAction>();
@@ -21,12 +24,14 @@ export function observeGsapGesture(writer: CommitMutation | null) {
     pendingResults += 1;
     return {
       ...options,
+      ...(edit && { pendingEdit: edit }),
       keyframeTelemetry: false,
       onResult: (result: MutationResult) => {
         pendingResults -= 1;
         options.onResult?.(result);
         if (!result.ok || result.changed !== true) return;
         changed = true;
+        edit?.markSaved();
         const members = changedMutationIndices(
           result,
           calls.length,
@@ -43,16 +48,18 @@ export function observeGsapGesture(writer: CommitMutation | null) {
   let commit: CommitMutation | null = null;
   if (writer) {
     commit = (selection, mutation, options) =>
-      writer(selection, mutation, observe([{ selection, mutation, options }], options));
+      join(() => writer(selection, mutation, observe([{ selection, mutation, options }], options)));
     if (writer.batch) {
       const batch = writer.batch;
-      commit.batch = (calls, options) => batch(calls, observe(calls, options));
+      commit.batch = (calls, options) => join(() => batch(calls, observe(calls, options)));
     }
   }
   return {
     commit,
+    drawKeepingUndone: <T>(draw: () => T): T => (edit ? edit.drawKeepingUndone(draw) : draw()),
     recordDomResult: (result: { changed: boolean } | undefined) => {
       changed ||= result?.changed === true;
+      if (result?.changed) edit?.markSaved();
     },
     finish: (domChanged = false): GeometryCommitResult => {
       if (pendingResults !== 0) return { ok: true, changed: false };

package/src/hooks/gsapResizeDropPoint.test.ts

@@ -75,6 +75,8 @@ interface ResizeCase {
   longhandTween?: boolean;
   /** What already writes this element's position. */
   positionWrite?: "static-set" | "keyframed-tween" | "none";
+  /** Undo paints the box back to its press look while the animations load. */
+  paintedBackWhileLoading?: boolean;
 }
 
 function createResizeElement(testCase: ResizeCase): HTMLElement {
@@ -241,6 +243,30 @@ async function runCase(testCase: ResizeCase) {
   } as unknown as HTMLIFrameElement;
 
   const dropPoint = el.getBoundingClientRect();
+  // A painted-back edit: undone on screen, shown again only inside a draw (as `drawKeepingUndone` does).
+  const look = () => ({
+    w: el.style.width,
+    h: el.style.height,
+    pos: { ...live.pos },
+    scale: { ...live.scale },
+  });
+  const show = (shown: ReturnType<typeof look>) => {
+    el.style.width = shown.w;
+    el.style.height = shown.h;
+    Object.assign(live, { pos: { ...shown.pos }, scale: { ...shown.scale } });
+  };
+  let shownEdit: ReturnType<typeof look> | null = null;
+  const paintBack = () => {
+    shownEdit = look();
+    show({ w: "", h: "", pos: { ...testCase.base }, scale: { ...testCase.liveScale } });
+  };
+  const draw = <T>(run: () => T): T => {
+    if (!shownEdit) return run();
+    show(shownEdit);
+    const drawn = run();
+    paintBack();
+    return drawn;
+  };
   const position = positionAnimation(testCase.positionWrite ?? "static-set", testCase.base);
   const animations = [scaleTween(!!testCase.longhandTween), ...(position ? [position] : [])];
   const commitMutation = vi.fn();
@@ -252,7 +278,12 @@ async function runCase(testCase: ResizeCase) {
     animations,
     iframe,
     commitMutation,
-    async () => animations,
+    async () => {
+      if (testCase.paintedBackWhileLoading) paintBack();
+      return animations;
+    },
+    undefined,
+    draw,
   );
 
   // Re-render what the file now says: the committed scale, the persisted
@@ -393,3 +424,10 @@ it("holds the drop point across a second drag", async () => {
   expect(second.settled.y).toBeCloseTo(second.dropPoint.y, 0);
   expect(second.settled.w).toBeCloseTo(second.dropPoint.w, 0);
 });
+
+it("lands on the drop point when undo paints the box back while its animations load", async () => {
+  const { dropPoint, settled } = await runCase({ ...CASES[0]!, paintedBackWhileLoading: true });
+  expect(settled.x).toBeCloseTo(dropPoint.x, 0);
+  expect(settled.y).toBeCloseTo(dropPoint.y, 0);
+  expect(settled.w).toBeCloseTo(dropPoint.w, 0);
+});

package/src/hooks/gsapResizeElementSize.test.tsx

@@ -5,6 +5,10 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 import type { GsapAnimation } from "@hyperframes/core/gsap-parser";
 import type { DomEditSelection } from "../components/editor/domEditingTypes";
 import { applyStudioBoxSizeDraft } from "../components/editor/manualEdits";
+import {
+  beginStudioPendingEdit,
+  paintBackNewestStudioPendingEdit,
+} from "../utils/studioPendingEdits";
 import { mountReactHarness } from "./domSelectionTestHarness";
 import { useDomGeometryCommits } from "./useDomGeometryCommits";
 import { useGsapAwareEditing } from "./useGsapAwareEditing";
@@ -134,4 +138,27 @@ describe("resizing an element GSAP positions", () => {
     expect(cssSize).toEqual([]);
     act(() => h.root.unmount());
   });
+
+  it("keeps a resize undo painted back drawn undone while its save lands, and draws it again on show again", async () => {
+    const h = mount([positionHold]);
+    const element = h.selection.element;
+    const edit = beginStudioPendingEdit(() => {
+      const shown = element.getAttribute("style");
+      element.setAttribute("style", "scale: none");
+      return () => element.setAttribute("style", shown ?? "");
+    });
+    const saved = edit.adopt(() => h.resize(h.selection, h.size, { x: -50, y: -33.5 }));
+    edit.settle(saved);
+    const shown = paintBackNewestStudioPendingEdit();
+
+    await act(() => saved);
+    expect(h.commitPatch.mock.calls.at(-1)![1]).toEqual(
+      expect.arrayContaining([{ type: "inline-style", property: "width", value: "340px" }]),
+    );
+    expect(element.getAttribute("style")).toBe("scale: none");
+
+    shown!.showAgain();
+    expect(element.getAttribute("style")).toContain("--hf-studio-width: 340px");
+    act(() => h.root.unmount());
+  });
 });

package/src/hooks/gsapResizeIntercept.ts

@@ -135,6 +135,7 @@ export async function tryGsapResizeIntercept(
   commitMutation: GsapDragCommitCallbacks["commitMutation"],
   fetchFallbackAnimations?: () => Promise<GsapAnimation[]>,
   dragOffset?: { x: number; y: number },
+  draw: <T>(run: () => T) => T = (run) => run(),
 ): Promise<GsapEditOutcome> {
   const fetchedAnimations = fetchFallbackAnimations ? await fetchFallbackAnimations() : [];
   const outcome = preflightGsapResizeIntercept(selection, animations, iframe, fetchedAnimations);
@@ -315,7 +316,7 @@ export async function tryGsapResizeIntercept(
     // difference and compensates, so release matches the drop pixel-for-pixel
     // regardless of live scale or repeat resizes.
     if (el) {
-      const dropRect = el.getBoundingClientRect();
+      const dropRect = draw(() => el.getBoundingClientRect());
       scaleDraftDropPoint = { x: dropRect.x, y: dropRect.y };
     }
   } else {
@@ -342,75 +343,61 @@ export async function tryGsapResizeIntercept(
     // resize took the size route and never moved anything: the drop point is
     // the drag's to settle, not ours.
     if (!scaleDraftEl) return false;
-    clearStudioBoxSize(scaleDraftEl);
-    if (!scaleDraftDropPoint || !selector) return false;
-    // Put the committed scale on the live element before measuring.
-    //
-    // This step reads where the commit lands the box and shifts the position
-    // hold by the difference. That only works if the commit has actually
-    // rendered, and whether it had was luck: on the FIRST resize of an element
-    // the timeline had not re-seeked yet, so this measured the element at its
-    // natural size, still sitting on the drop point, computed a residual of
-    // zero, and skipped the correction entirely. The scale then landed, GSAP
-    // rendered it around the element's centre, and the element jumped by the
-    // whole drag distance. Elements that had been resized before got a
-    // correction only because their PREVIOUS scale made the residual non-zero.
-    //
-    // Setting it here costs nothing when the commit has already rendered (same
-    // value) and makes the measurement below mean what it says either way.
-    if (committedScale) {
-      setElementGsapScale(scaleDraftEl, committedScale.x, committedScale.y);
-    }
-    // Measure from the pre-gesture position, not the draft one.
-    //
-    // The resize draft translates the element to keep the dragged corner under
-    // the cursor, but the scale route never persists that translation — the
-    // element renders back at its pre-gesture position as soon as the commit
-    // lands. Measuring while the draft translation was still applied made the
-    // residual carry the whole drag distance, and the position commit then
-    // composed that residual onto the pre-gesture base (it reads the gesture's
-    // own base attributes, not the live value), so the element landed a full
-    // drag away from the drop point on every scale resize.
-    const gsapPos = readGsapPositionFromIframe(iframe, selector) ?? { x: 0, y: 0 };
-    const { baseGsapX, baseGsapY } = computeDraggedGsapPosition(
-      selection.element,
-      { x: 0, y: 0 },
-      gsapPos,
-    );
-    const base = { x: baseGsapX, y: baseGsapY };
-    setElementGsapPosition(scaleDraftEl, base.x, base.y);
-    const post = scaleDraftEl.getBoundingClientRect();
-    const residual = { x: scaleDraftDropPoint.x - post.x, y: scaleDraftDropPoint.y - post.y };
-    if (!Number.isFinite(residual.x) || !Number.isFinite(residual.y)) return false;
-    if (Math.abs(residual.x) < 0.5 && Math.abs(residual.y) < 0.5) {
-      logResize("scale-finalize", { skipped: "already-on-drop-point", residual, base });
-      // Settled, with nothing to write. Still ours: forwarding the drag offset
-      // on top would move the box off the point it is already sitting on.
-      return true;
+    const draftEl = scaleDraftEl;
+    if (!scaleDraftDropPoint || !selector) {
+      draw(() => clearStudioBoxSize(draftEl));
+      return false;
     }
-    // The ONE corrected position — rounded once so the live runtime and the
-    // persisted file agree exactly (commitStaticGsapPosition composes the same
-    // rounded value from this delta).
-    const corrected = {
-      x: roundTo3(base.x + residual.x),
-      y: roundTo3(base.y + residual.y),
-    };
-    logResize("scale-finalize", {
-      dropPoint: scaleDraftDropPoint,
-      post: { x: post.x, y: post.y },
-      residual,
-      gsapPos,
-      base,
-      corrected,
+    const dropPoint = scaleDraftDropPoint;
+    const measured = draw(() => {
+      clearStudioBoxSize(draftEl);
+      // Draw the committed scale before measuring: on a first resize the timeline has not re-seeked yet,
+      // so the box would read at its natural size and the correction would be skipped.
+      if (committedScale) {
+        setElementGsapScale(draftEl, committedScale.x, committedScale.y);
+      }
+      // Measure from the pre-gesture position: the scale route never saves the draft's translation, and
+      // the position write composes the residual onto that same base.
+      const gsapPos = readGsapPositionFromIframe(iframe, selector) ?? { x: 0, y: 0 };
+      const { baseGsapX, baseGsapY } = computeDraggedGsapPosition(
+        selection.element,
+        { x: 0, y: 0 },
+        gsapPos,
+      );
+      const base = { x: baseGsapX, y: baseGsapY };
+      setElementGsapPosition(draftEl, base.x, base.y);
+      const post = draftEl.getBoundingClientRect();
+      const residual = { x: dropPoint.x - post.x, y: dropPoint.y - post.y };
+      if (!Number.isFinite(residual.x) || !Number.isFinite(residual.y)) return null;
+      if (Math.abs(residual.x) < 0.5 && Math.abs(residual.y) < 0.5) {
+        logResize("scale-finalize", { skipped: "already-on-drop-point", residual, base });
+        // Settled, with nothing to write. Still ours: forwarding the drag offset
+        // on top would move the box off the point it is already sitting on.
+        return "settled" as const;
+      }
+      // The ONE corrected position — rounded once so the live runtime and the
+      // persisted file agree exactly (commitStaticGsapPosition composes the same
+      // rounded value from this delta).
+      const corrected = {
+        x: roundTo3(base.x + residual.x),
+        y: roundTo3(base.y + residual.y),
+      };
+      logResize("scale-finalize", {
+        dropPoint,
+        post: { x: post.x, y: post.y },
+        residual,
+        gsapPos,
+        base,
+        corrected,
+      });
+      // Correct the live box in the same task as the measurement, so no frame shows it off the drop
+      // point while the position write is in flight.
+      setElementGsapPosition(draftEl, corrected.x, corrected.y);
+      return { base, corrected };
     });
-    // Correct the LIVE runtime NOW, synchronously: the soft reload above just
-    // rendered the committed scale around the element center — NOT at the drop
-    // point — and everything up to here runs in the same microtask chain as
-    // that reload, so no frame has painted the uncorrected position yet. The
-    // server persist below costs network round-trips; without this set, the
-    // element visibly sits at the wrong spot for those frames (the drop
-    // "jump"). The persisted commit re-applies the same values (idempotent).
-    setElementGsapPosition(scaleDraftEl, corrected.x, corrected.y);
+    if (measured === null) return false;
+    if (measured === "settled") return true;
+    const { base, corrected } = measured;
     // Re-fetch: the scale commit above just rewrote the script, so the caller's
     // animation list (and its ids) may be stale for the position lookup.
     const currentAnimations = fetchFallbackAnimations

package/src/hooks/gsapScriptCommitTypes.ts

@@ -2,6 +2,7 @@ import type { ParsedGsap } from "@hyperframes/core/gsap-parser";
 import type { Composition } from "@hyperframes/sdk";
 import type { DomEditSelection } from "../components/editor/domEditingTypes";
 import type { PublishSdkSession } from "../utils/sdkCutover";
+import type { StudioEditInFlight } from "../utils/studioPendingEdits";
 import type { RuntimeTweenChange } from "./gsapRuntimePatch";
 import type { KeyframeUsageAction } from "../utils/keyframeUsage";
 
@@ -47,6 +48,7 @@ export interface CommitMutationOptions {
   /** Carries a deferred write not yet on screen (no patch, or a missed one) to the final render. */
   previewFallbackLatch?: { pending: boolean };
   beforeReload?: () => void;
+  pendingEdit?: StudioEditInFlight;
   /**
    * Serialize this commit against others sharing the same key. Used to chain
    * per-animationId GSAP meta updates. Every commit independently takes the

package/src/hooks/useGsapAwareEditing.groupPlan.test.tsx

@@ -6,6 +6,10 @@ import type { GsapAnimation } from "@hyperframes/core/gsap-parser";
 import type { DomEditSelection } from "../components/editor/domEditingTypes";
 import type { DomEditGroupPathOffsetCommit } from "../components/editor/domEditOverlayGestures";
 import { usePlayerStore } from "../player/store/playerStore";
+import {
+  beginStudioPendingEdit,
+  paintBackNewestStudioPendingEdit,
+} from "../utils/studioPendingEdits";
 import { trackStudioEditBlocked } from "../utils/studioSaveDiagnostics";
 import { GSAP_EDIT_BLOCK_COPY } from "./gsapEditOutcome";
 import { mountGsapAwareEditing } from "./useGsapAwareEditing.testHelpers";
@@ -65,7 +69,10 @@ function mountGroup(animations: GsapAnimation[]) {
     batch: vi.fn().mockResolvedValue(undefined),
   });
   const showToast = vi.fn();
-  const stageElementPositionOffset = vi.fn(() => ({ save: vi.fn(), rollback: vi.fn() }));
+  const stageElementPositionOffset = vi.fn((selection: DomEditSelection) => {
+    selection.element.style.setProperty("translate", "30px 0px");
+    return { save: vi.fn().mockResolvedValue(undefined), rollback: vi.fn() };
+  });
   const { editing, root } = mountGsapAwareEditing({
     gsapCommitMutation: commitMutation,
     activeCompPath: "index.html",
@@ -158,3 +165,24 @@ describe("a group drag plans every member before its first write", () => {
     act(() => h.root.unmount());
   });
 });
+
+it("keeps a member it moves on its own CSS undone when undo painted the group back", async () => {
+  const h = mountGroup(["b", "c"].map((id) => positionTween(id)));
+  const plain = h.elements[0]!;
+  const edit = beginStudioPendingEdit(() => {
+    const shown = plain.getAttribute("style") ?? "";
+    plain.setAttribute("style", "");
+    return () => plain.setAttribute("style", shown);
+  });
+  const saved = edit.adopt(() =>
+    h.groupCommit(h.updates.map((u, i) => (i === 0 ? { ...u, plainTranslate: true } : u))),
+  );
+  edit.settle(saved);
+  const shown = paintBackNewestStudioPendingEdit();
+
+  await act(() => saved);
+  expect(plain.getAttribute("style")).toBe("");
+  shown!.showAgain();
+  expect(plain.getAttribute("style")).toContain("translate: 30px 0px");
+  act(() => h.root.unmount());
+});

package/src/hooks/useGsapAwareEditing.test.tsx

@@ -423,6 +423,7 @@ describe("useGsapAwareEditing anchored resize", () => {
       expect.any(Function),
       expect.any(Function),
       undefined,
+      expect.any(Function),
     );
     act(() => h.root.unmount());
   });

package/src/hooks/useGsapAwareEditing.ts

@@ -169,8 +169,10 @@ export function useGsapAwareEditing({
             modifiers,
           );
           await saveMove(outcome, async () => {
-            const result = await stageElementPositionOffset(selection, next, false).save();
-            writes.recordDomResult(result);
+            const staged = writes.drawKeepingUndone(() =>
+              stageElementPositionOffset(selection, next, false),
+            );
+            writes.recordDomResult(await staged.save());
           });
           return writes.finish();
         } catch (error) {
@@ -258,11 +260,8 @@ export function useGsapAwareEditing({
           // Saved after the size, under its undo key, so the two are one step.
           await saveMove(dragOutcome, async () => {
             const plainAfterSettle = editsPlainCss(selection.element, "move");
-            anchorMove = stageElementPositionOffset(
-              selection,
-              offset,
-              plainAfterSettle,
-              coalesceKey,
+            anchorMove = writes.drawKeepingUndone(() =>
+              stageElementPositionOffset(selection, offset, plainAfterSettle, coalesceKey),
             );
           });
         }
@@ -270,17 +269,20 @@ export function useGsapAwareEditing({
       await runGestureTransaction({
         element: selection.element,
         label: "Resize layer",
+        draw: writes.drawKeepingUndone,
         settle: () => {
           // Scale resize settles its center-scale residual after the scale commit
           // renders. Width/height can settle its anchored position immediately.
           if (!offset || scaleRoute || !selector) return;
-          const gsapPos = readGsapPositionFromIframe(previewIframeRef.current, selector) ?? {
-            x: 0,
-            y: 0,
-          };
-          const { newX, newY } = computeDraggedGsapPosition(selection.element, offset, gsapPos);
-          logResize("sync-settle", { gsapPos, offset, newX, newY });
-          setElementGsapPosition(selection.element, newX, newY);
+          writes.drawKeepingUndone(() => {
+            const gsapPos = readGsapPositionFromIframe(previewIframeRef.current, selector) ?? {
+              x: 0,
+              y: 0,
+            };
+            const { newX, newY } = computeDraggedGsapPosition(selection.element, offset, gsapPos);
+            logResize("sync-settle", { gsapPos, offset, newX, newY });
+            setElementGsapPosition(selection.element, newX, newY);
+          });
         },
         persist: async (commit, coalesceKey) => {
           if (writes.commit) {
@@ -294,16 +296,13 @@ export function useGsapAwareEditing({
                 commitMutation,
                 makeFetchFallback(selection),
                 offset,
+                writes.drawKeepingUndone,
               );
               assertGsapEditPersisted(outcome);
               // Saved before the buffered GSAP writes, so their reload stays the gesture's last render.
               if (outcome.status === "element-size") {
-                const result = await handleDomBoxSizeCommit(
-                  selection,
-                  next,
-                  undefined,
-                  undefined,
-                  coalesceKey,
+                const result = await writes.drawKeepingUndone(() =>
+                  handleDomBoxSizeCommit(selection, next, undefined, undefined, coalesceKey),
                 );
                 writes.recordDomResult(result);
               } else cropUndoKey = coalesceKey;
@@ -332,11 +331,8 @@ export function useGsapAwareEditing({
           writes.recordDomResult(anchorResult);
           // Only now is the size live for every caller, drag or not.
           if (cropUndoKey) {
-            const cropResult = await saveCropResize(
-              stageCrop,
-              selection,
-              commitPositionPatchToHtml,
-              cropUndoKey,
+            const cropResult = await writes.drawKeepingUndone(() =>
+              saveCropResize(stageCrop, selection, commitPositionPatchToHtml, cropUndoKey!),
             );
             writes.recordDomResult(cropResult);
           }

package/src/hooks/useGsapAwareGroupMove.ts

@@ -123,12 +123,10 @@ export function useGsapAwareGroupMove({
         renderOnCommit = index === lastScriptWrite;
         const plain = offsetMembers.get(selection);
         if (plain !== undefined) {
-          const result = await stageElementPositionOffset(
-            selection,
-            next,
-            plain,
-            coalesceKey,
-          ).save();
+          const staged = writes.drawKeepingUndone(() =>
+            stageElementPositionOffset(selection, next, plain, coalesceKey),
+          );
+          const result = await staged.save();
           writes.recordDomResult(result);
           continue;
         }

package/src/hooks/useGsapScriptCommits.test.tsx

@@ -38,7 +38,12 @@ import type {
 import { persistSdkSerialize } from "../utils/sdkCutover";
 import { jsonResponse } from "./fetchStubTestUtils";
 import { applyPreviewSync, useGsapScriptCommits } from "./useGsapScriptCommits";
-import { hasStudioPendingEdits } from "../utils/studioPendingEdits";
+import {
+  beginStudioPendingEdit,
+  hasStudioPendingEdits,
+  paintBackNewestStudioPendingEdit,
+} from "../utils/studioPendingEdits";
+import { observeGsapGesture } from "./gsapGestureOutcome";
 
 // ── applyPreviewSync (pure preview-sync decision) ────────────────────────────
 
@@ -490,6 +495,42 @@ describe("a GSAP script commit", () => {
     await act(async () => void (await committed));
     expect(hasStudioPendingEdits()).toBe(false);
   });
+
+  it("a gesture's write after an await is still its edit, and once undo paints that edit back it saves without drawing it", async () => {
+    applySoftReload.mockReturnValue("applied");
+    let respond!: () => void;
+    const body: MutationResult = { ok: true, changed: true, after: "AFTER", scriptText: "SCRIPT" };
+    vi.stubGlobal(
+      "fetch",
+      vi.fn(
+        () =>
+          new Promise((resolve) => {
+            respond = () => resolve({ ok: true, json: async () => body } as unknown as Response);
+          }),
+      ),
+    );
+    const deps = renderCommitHook();
+    const edit = beginStudioPendingEdit(() => () => undefined);
+    const saved = edit.adopt(async () => {
+      const writes = observeGsapGesture(deps.api.commitMutation);
+      await Promise.resolve();
+      return writes.commit!(selection, { x: 10 }, { label: "Move layer", softReload: true });
+    });
+    edit.settle(saved);
+    await vi.waitFor(() => expect(fetch).toHaveBeenCalled());
+
+    const shown = paintBackNewestStudioPendingEdit();
+    expect(shown).not.toBeNull();
+    await act(async () => {
+      respond();
+      await saved;
+    });
+    expect(deps.onFileContentChanged).toHaveBeenCalledWith("index.html", "AFTER");
+    expect(applySoftReload).not.toHaveBeenCalled();
+
+    shown!.showAgain();
+    expect(applySoftReload).toHaveBeenCalledTimes(1);
+  });
 });
 
 describe("runCommit — instantPatch wiring", () => {

package/src/hooks/useGsapScriptCommits.ts

@@ -113,11 +113,18 @@ function finishUnchangedMutation(
     !options.skipReload &&
     (instantPatchesFor(options).length > 0 || options.previewFallbackLatch?.pending)
   ) {
-    applyPreviewSync(iframe, result, options, reloadPreview);
+    redrawUnlessPaintedBack(options, () =>
+      applyPreviewSync(iframe, result, options, reloadPreview),
+    );
   }
   return true;
 }
 
+function redrawUnlessPaintedBack(options: CommitMutationOptions, redraw: () => void): void {
+  if (options.pendingEdit) options.pendingEdit.drawUnlessUndone(redraw);
+  else redraw();
+}
+
 function refreshMutationPreview(
   iframe: HTMLIFrameElement | null,
   result: MutationResult,
@@ -126,8 +133,10 @@ function refreshMutationPreview(
   onCacheInvalidate: () => void,
   nestedFiles?: Map<string, string> | null,
 ): void {
-  options.beforeReload?.();
-  applyPreviewSync(iframe, result, options, reloadPreview, nestedFiles);
+  redrawUnlessPaintedBack(options, () => {
+    options.beforeReload?.();
+    applyPreviewSync(iframe, result, options, reloadPreview, nestedFiles);
+  });
   onCacheInvalidate();
 }