@hyperframes/studio 0.8.106 → 0.8.108

package/src/hooks/useEditHistoryActions.paint.test.tsx

@@ -1,5 +1,5 @@
 // @vitest-environment happy-dom
-import { act, createElement } from "react";
+import { act, createElement, type ReactElement } from "react";
 import { createRoot } from "react-dom/client";
 import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
@@ -10,6 +10,11 @@ import {
   openProjectHistory,
   type StudioApiAdapter,
 } from "@hyperframes/studio-server";
+import { useDomEditNudge } from "../components/editor/useDomEditNudge";
+import { DomEditProvider, useDomEditActionsContext } from "../contexts/DomEditContext";
+import { __resetForTests as resetNudgeKeys } from "../utils/canvasNudgeGate";
+import { trackedStudioEdit } from "../utils/studioPendingEdits";
+import { makeSelection } from "./domSelectionTestHarness";
 import { useEditHistoryActions } from "./useEditHistoryActions";
 import { usePersistentEditHistory } from "./usePersistentEditHistory";
 import { usePreviewPersistence } from "./usePreviewPersistence";
@@ -19,6 +24,7 @@ const page = (left: string, top = "0px") =>
 const BEFORE = page("10px");
 const AFTER = page("50px");
 const OUTSIDE = page("50px", "99px");
+const NUDGED = page("51px");
 
 const cleanup: Array<() => unknown> = [];
 let scratch = "";
@@ -78,14 +84,15 @@ async function studio() {
       showToast: () => {},
       syncHistoryPreviewAfterApply: persistence.syncHistoryPreviewAfterApply,
       showHistoryRestoreNow: persistence.showHistoryRestoreNow,
-      waitForPendingDomEditSaves: persistence.waitForPendingDomEditSaves,
+      waitForPendingDomEditSaves: persistence.settlePendingEdits,
     });
     return null;
   }
   const root = createRoot(document.createElement("div"));
   await act(async () => root.render(createElement(Harness)));
   cleanup.push(() => act(() => root.unmount()));
-  const box = () => iframe.contentDocument!.getElementById("box")!.style.left;
+  const element = (id: string) => iframe.contentDocument!.getElementById(id)!;
+  const box = () => element("box").style.left;
   const other = () => iframe.contentDocument!.getElementById("other")!.style.top;
   const show = (html: string) => {
     iframe.contentDocument!.documentElement.innerHTML = new DOMParser().parseFromString(
@@ -105,8 +112,16 @@ async function studio() {
     );
     await vi.waitFor(() => expect(history.undoLabel).toBe("Move layer"));
   };
+  /** Mounts `ui` beside Studio, as the canvas is, for the rest of the test. */
+  const mount = (ui: ReactElement) => {
+    const canvas = createRoot(document.createElement("div"));
+    act(() => canvas.render(ui));
+    cleanup.push(() => act(() => canvas.unmount()));
+  };
   return {
     history: () => history,
+    element,
+    mount,
     persistence: () => persistence,
     actions: () => actions,
     box,
@@ -164,3 +179,148 @@ it("an undo after an outside write ends with the preview showing the file the se
   expect(s.other()).toBe("0px");
   expect(s.box()).toBe("50px");
 });
+
+/** The canvas's arrow-key nudge on the box; `save` stands in for the burst's save once the keys stop. */
+function Nudge({ target, save }: { target: HTMLElement; save: () => Promise<void> }) {
+  const selection = makeSelection("Box", target);
+  const ref = <T,>(current: T) => ({ current });
+  useDomEditNudge({
+    selection,
+    groupSelections: [],
+    allowCanvasMovement: true,
+    selectionRef: ref(selection),
+    overlayRectRef: ref({ left: 0, top: 0, width: 100, height: 40, editScaleX: 1, editScaleY: 1 }),
+    groupOverlayItemsRef: ref([]),
+    gestureRef: ref(null),
+    groupGestureRef: ref(null),
+    blockedMoveRef: ref(null),
+    onManualDragStartRef: ref(() => {}),
+    onBlockedMoveRef: ref(() => {}),
+    onPathOffsetCommitRef: ref(save),
+    onGroupPathOffsetCommitRef: ref(async () => {}),
+  });
+  return null;
+}
+
+it("an undo pressed while a nudge waits for more keys never shows the move before it undone", async () => {
+  const s = await studio();
+  await s.edit();
+  resetNudgeKeys();
+  let finish!: () => void;
+  const save = vi.fn(async () => {
+    await new Promise<void>((resolve) => (finish = resolve));
+    writeFileSync(s.path, NUDGED);
+    await s.history().recordEdit({
+      label: "Move layer",
+      files: { "index.html": { before: AFTER, after: NUDGED } },
+    });
+  });
+  s.mount(createElement(Nudge, { target: s.element("box"), save }));
+  act(() => {
+    window.dispatchEvent(new KeyboardEvent("keydown", { key: "ArrowRight", cancelable: true }));
+  });
+
+  const nudge = () => s.element("box").style.getPropertyValue("translate");
+  expect(nudge()).not.toBe("");
+
+  const undone = s.actions().undo();
+  expect(s.box()).toBe("50px");
+  expect(nudge()).toBe("");
+  await vi.waitFor(() => expect(save).toHaveBeenCalledTimes(1));
+  expect(nudge()).toBe("");
+  finish();
+  await act(() => undone);
+  expect(save).toHaveBeenCalledTimes(1);
+  expect(s.file()).toBe(AFTER);
+  expect(s.box()).toBe("50px");
+  expect(nudge()).toBe("");
+});
+
+it("an undo pressed while a nudge's save is queued shows the nudge undone in the key's own task", async () => {
+  const s = await studio();
+  await s.edit();
+  resetNudgeKeys();
+  let finish!: () => void;
+  const save = vi.fn(async () => {
+    await new Promise<void>((resolve) => (finish = resolve));
+    writeFileSync(s.path, NUDGED);
+    await s.history().recordEdit({
+      label: "Move layer",
+      files: { "index.html": { before: AFTER, after: NUDGED } },
+    });
+  });
+  s.mount(createElement(Nudge, { target: s.element("box"), save }));
+  act(() => {
+    window.dispatchEvent(new KeyboardEvent("keydown", { key: "ArrowRight", cancelable: true }));
+  });
+  await vi.waitFor(() => expect(save).toHaveBeenCalledTimes(1));
+  const nudge = () => s.element("box").style.getPropertyValue("translate");
+  expect(nudge()).not.toBe("");
+
+  const undone = s.actions().undo();
+  expect(nudge()).toBe("");
+  expect(s.box()).toBe("50px");
+  finish();
+  await act(() => undone);
+  expect(s.file()).toBe(AFTER);
+  expect(nudge()).toBe("");
+  expect(s.box()).toBe("50px");
+});
+
+it("an undo pressed while a queued save fails undoes the edit before it, file and box alike", async () => {
+  const s = await studio();
+  await s.edit();
+  const box = s.element("box");
+  let fail!: () => void;
+  const handleDomStyleCommit = vi.fn(async () => {
+    box.style.left = "70px";
+    try {
+      await s.persistence().queueDomEditSave(async () => {
+        await new Promise<void>((resolve) => (fail = resolve));
+        throw new Error("The save failed.");
+      });
+    } catch (error) {
+      box.style.left = "50px";
+      throw error;
+    }
+  });
+  let actions!: ReturnType<typeof useDomEditActionsContext>;
+  function Canvas() {
+    actions = useDomEditActionsContext();
+    return null;
+  }
+  const value = { handleDomStyleCommit } as unknown as Parameters<
+    typeof DomEditProvider
+  >[0]["value"];
+  s.mount(
+    <DomEditProvider value={value}>
+      <Canvas />
+    </DomEditProvider>,
+  );
+  const failed = actions.handleDomStyleCommit("left", "70px");
+
+  const undone = s.actions().undo();
+  await vi.waitFor(() => expect(fail).toBeTypeOf("function"));
+  fail();
+  await expect(failed).rejects.toThrow("The save failed.");
+  await act(() => undone);
+  expect(s.file()).toBe(BEFORE);
+  expect(s.box()).toBe("10px");
+});
+
+it("an undo pressed while a tracked timeline edit fails still undoes the edit before it", async () => {
+  const s = await studio();
+  await s.edit();
+  let fail!: () => void;
+  const timelineEdit = trackedStudioEdit(
+    () => new Promise<void>((_, reject) => (fail = () => reject(new Error("The save failed.")))),
+  );
+  const failed = timelineEdit();
+
+  const undone = s.actions().undo();
+  fail();
+  await expect(failed).rejects.toThrow("The save failed.");
+  await act(() => undone);
+  expect(s.file()).toBe(BEFORE);
+  expect(s.box()).toBe("10px");
+});

package/src/hooks/useEditHistoryActions.ts

@@ -3,6 +3,7 @@ import { useCallback, useMemo } from "react";
 import { STUDIO_MOTION_PATH } from "../components/editor/studioMotion";
 import { serializeStudioFileMutations } from "../utils/studioFileMutationCoordinator";
 import type { RestoreFiles } from "../utils/gsapUndoRestore";
+import { revertNewestStudioPendingEdit } from "../utils/studioPendingEdits";
 
 interface HistoryResult {
   ok: boolean;
@@ -74,7 +75,10 @@ export function useEditHistoryActions({
       const noun = direction === "undo" ? "Undo" : "Redo";
       // Paint the step in the key's own task when this tab knows it; the server's answer then confirms or corrects.
       const predicted = editHistory.predict?.(direction) ?? null;
-      const putBack = predicted ? (showHistoryRestoreNow?.(predicted.files) ?? null) : null;
+      const predictedShown = predicted ? (showHistoryRestoreNow?.(predicted.files) ?? null) : null;
+      const pendingEditShown =
+        !predictedShown && direction === "undo" ? revertNewestStudioPendingEdit() : null;
+      const putBack = predictedShown ?? pendingEditShown;
       let result: HistoryResult = { ok: false, reason: "failed" };
       let serverSteppedShown = false;
       try {
@@ -83,8 +87,10 @@ export function useEditHistoryActions({
           readFile: readHistoryFile,
           serialize: serializeHistoryFiles,
         });
-        serverSteppedShown =
-          Boolean(putBack && result.ok && result.label) && result.undoes === predicted?.id;
+        const stepped = Boolean(result.ok && result.label);
+        serverSteppedShown = predictedShown
+          ? stepped && result.undoes === predicted?.id
+          : stepped && Boolean(pendingEditShown);
       } finally {
         if (putBack && !serverSteppedShown) putBack();
       }
@@ -100,7 +106,10 @@ export function useEditHistoryActions({
         return;
       }
       if (result.ok && result.label) {
-        const files = serverSteppedShown ? fromShown(result.files, predicted!.files) : result.files;
+        const files =
+          serverSteppedShown && predictedShown
+            ? fromShown(result.files, predicted!.files)
+            : result.files;
         const restore = { paths: result.paths, files };
         onAfterUndoRedo?.(restore);
         if (activeCompPath && result.paths?.includes(activeCompPath)) {

package/src/hooks/useElementPicker.test.ts

@@ -19,6 +19,22 @@ afterEach(() => {
   document.body.innerHTML = "";
 });
 
+// The runtime's element-picked message, posted by `from`.
+const picked = (from: Window | null, selector: string) =>
+  act(() => {
+    window.dispatchEvent(
+      new MessageEvent("message", {
+        source: from,
+        data: {
+          source: "hf-preview",
+          type: "element-picked",
+          elementInfo: { selector, tagName: "h1" },
+          ...runtimeProtocolMetadata(30),
+        },
+      }),
+    );
+  });
+
 // The preview page: the saved markup plus what the runtime adds to it.
 function mountPreview(mounted = ""): HTMLIFrameElement {
   const iframe = document.createElement("iframe");
@@ -61,19 +77,7 @@ function mountPicker(
   }
   root = createRoot(document.createElement("div"));
   act(() => root?.render(React.createElement(Harness)));
-  act(() => {
-    window.dispatchEvent(
-      new MessageEvent("message", {
-        source: iframe.contentWindow,
-        data: {
-          source: "hf-preview",
-          type: "element-picked",
-          elementInfo: { selector, tagName: "h1" },
-          ...runtimeProtocolMetadata(30),
-        },
-      }),
-    );
-  });
+  picked(iframe.contentWindow, selector);
   const picker = () => api as ReturnType<typeof useElementPicker>;
   return {
     picker,
@@ -170,3 +174,48 @@ describe("an edit to a picked element without an id", () => {
     expect(synced).toEqual([]);
   });
 });
+
+describe("a pick across a reload that swaps the preview frame", () => {
+  function mountSwapping() {
+    const live = mountPreview();
+    const ref: { current: HTMLIFrameElement | null } = { current: live };
+    let api: ReturnType<typeof useElementPicker> | null = null;
+    function Harness() {
+      api = useElementPicker(ref);
+      return null;
+    }
+    root = createRoot(document.createElement("div"));
+    act(() => root?.render(React.createElement(Harness)));
+    return { live, ref, picker: () => api as ReturnType<typeof useElementPicker> };
+  }
+
+  it("keeps a pick posted by the frame it was made in after a new frame took its place", () => {
+    const { live, ref, picker } = mountSwapping();
+    picked(live.contentWindow, "h1");
+    act(() => picker().clearPick());
+    // The reload promotes its frame before the old frame's pick message is handled.
+    const old = live.contentWindow;
+    ref.current = mountPreview();
+    live.remove();
+    picked(old, "h1.next");
+    expect(picker().pickedElement?.selector).toBe("h1.next");
+  });
+
+  it("does not keep trusting a zoomed frame once the zoom is gone", () => {
+    const { picker } = mountSwapping();
+    const zoom = mountPreview();
+    act(() => picker().setActiveIframe(zoom));
+    picked(zoom.contentWindow, "h1");
+    expect(picker().pickedElement?.selector).toBe("h1");
+    act(() => picker().setActiveIframe(null));
+    picked(zoom.contentWindow, "h1.late");
+    expect(picker().pickedElement?.selector).toBe("h1");
+  });
+
+  it("still ignores a frame it never showed", () => {
+    const { picker } = mountSwapping();
+    const stranger = mountPreview();
+    picked(stranger.contentWindow, "h1");
+    expect(picker().pickedElement).toBeNull();
+  });
+});

package/src/hooks/useElementPicker.ts

@@ -97,6 +97,8 @@ export function useElementPicker(
     setPickedElement(null);
   }, []);
 
+  const windowsThatWerePrimary = useRef(new WeakSet<MessageEventSource>());
+
   // Listen for picker messages from the iframe
   useMountEffect(() => {
     // One guard per message field, then one branch per message type.
@@ -105,10 +107,16 @@ export function useElementPicker(
       const data = e.data;
       if (data?.source !== "hf-preview") return;
       if (!acceptStudioRuntimeMessage(data)) return;
-      // Accept events from either the primary iframe or the active override
+      // The primary frame, the active override, or a primary frame a reload just swapped out.
       const activeIframe = getActiveIframe();
       if (!activeIframe) return;
-      if (e.source !== activeIframe.contentWindow && e.source !== iframeRef.current?.contentWindow)
+      if (!e.source) return;
+      if (e.source === iframeRef.current?.contentWindow)
+        windowsThatWerePrimary.current.add(e.source);
+      else if (
+        e.source !== activeIframe.contentWindow &&
+        !windowsThatWerePrimary.current.has(e.source)
+      )
         return;
 
       if (data.type === "element-picked" && data.elementInfo) {

package/src/hooks/useFreezeFrame.test.ts

@@ -0,0 +1,56 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { TimelineElement } from "../player";
+import { requestFreezeFrame } from "./useFreezeFrame";
+
+afterEach(() => vi.unstubAllGlobals());
+
+const element: TimelineElement = {
+  id: "talk",
+  domId: "talk",
+  tag: "video",
+  start: 5,
+  duration: 6,
+  track: 0,
+  parentCompositionStart: 4,
+};
+
+function stubFetch(freezeResponse: { status: number; body: unknown }) {
+  const calls: Array<{ url: string; body: unknown }> = [];
+  vi.stubGlobal(
+    "fetch",
+    vi.fn(async (url: string, init?: { body?: string }) => {
+      calls.push({ url, body: init?.body ? JSON.parse(init.body) : null });
+      if (url.includes("/files/")) return new Response(JSON.stringify({ version: "v1" }));
+      return new Response(JSON.stringify(freezeResponse.body), { status: freezeResponse.status });
+    }),
+  );
+  return calls;
+}
+
+describe("requestFreezeFrame", () => {
+  it("posts the clip target, file version and an authored-time playhead", async () => {
+    const calls = stubFetch({ status: 200, body: { before: "a", after: "b", version: "v2" } });
+    const result = await requestFreezeFrame({
+      projectId: "p",
+      path: "scene.html",
+      element,
+      playhead: 7.5,
+    });
+    expect(result).toEqual({ before: "a", after: "b", version: "v2" });
+    const post = calls[1];
+    expect(post?.url).toContain("/file-mutations/freeze-frame");
+    expect(post?.body).toMatchObject({
+      path: "scene.html",
+      expectedVersion: "v1",
+      target: { id: "talk" },
+      playhead: 3.5,
+    });
+  });
+
+  it("surfaces the server's error", async () => {
+    stubFetch({ status: 400, body: { error: "Move the playhead inside a video clip to freeze" } });
+    await expect(
+      requestFreezeFrame({ projectId: "p", path: "index.html", element, playhead: 7 }),
+    ).rejects.toThrow("Move the playhead inside a video clip to freeze");
+  });
+});

package/src/hooks/useFreezeFrame.ts

@@ -0,0 +1,121 @@
+import { useCallback, useRef } from "react";
+import type { TimelineElement } from "../player";
+import { toAuthoredStart } from "../player/store/timelineElement";
+import { buildPatchTarget } from "../utils/timelineElementSplit";
+import { buildProjectApiPath } from "../utils/projectRouting";
+import { markStudioWriteToken } from "../utils/studioFileVersion";
+import { serializeStudioFileMutations } from "../utils/studioFileMutationCoordinator";
+import type { RecordEditInput } from "../utils/studioFileHistory";
+
+type ProjectFileWriter = (path: string, content: string, expectedContent?: string) => Promise<void>;
+
+interface FreezeFrameResponse {
+  before: string;
+  after: string;
+  version: string;
+}
+
+function isFreezeFrameResponse(value: unknown): value is FreezeFrameResponse {
+  if (typeof value !== "object" || value === null) return false;
+  const body: Partial<Record<keyof FreezeFrameResponse, unknown>> = value;
+  return (
+    typeof body.before === "string" &&
+    typeof body.after === "string" &&
+    typeof body.version === "string"
+  );
+}
+
+function errorOf(value: unknown): string | null {
+  if (typeof value !== "object" || value === null || !("error" in value)) return null;
+  return typeof value.error === "string" ? value.error : null;
+}
+
+async function readVersion(projectId: string, path: string): Promise<string> {
+  const response = await fetch(
+    buildProjectApiPath(projectId, `/files/${encodeURIComponent(path)}`),
+  );
+  const body: unknown = await response.json().catch(() => null);
+  const version =
+    typeof body === "object" && body !== null && "version" in body ? body.version : null;
+  if (!response.ok || typeof version !== "string") throw new Error(`Could not read ${path}`);
+  return version;
+}
+
+/** POST the freeze to studio-server, which extracts the still and writes the whole edit at once. */
+export async function requestFreezeFrame(input: {
+  projectId: string;
+  path: string;
+  element: TimelineElement;
+  playhead: number;
+}): Promise<FreezeFrameResponse> {
+  const target = buildPatchTarget(input.element);
+  if (!target) throw new Error("This clip has no id to freeze it by");
+  const expectedVersion = await readVersion(input.projectId, input.path);
+  const transactionToken = `freeze:${crypto.randomUUID()}`;
+  markStudioWriteToken(transactionToken);
+  const response = await fetch(
+    buildProjectApiPath(input.projectId, "/file-mutations/freeze-frame"),
+    {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "X-Hyperframes-Write-Token": transactionToken,
+      },
+      body: JSON.stringify({
+        path: input.path,
+        expectedVersion,
+        target,
+        playhead: toAuthoredStart(input.element, input.playhead),
+        transactionToken,
+      }),
+    },
+  );
+  const body: unknown = await response.json().catch(() => null);
+  if (!response.ok || !isFreezeFrameResponse(body)) {
+    throw new Error(errorOf(body) ?? `Freeze frame failed (${response.status})`);
+  }
+  return body;
+}
+
+interface UseFreezeFrameOptions {
+  projectId: string | null;
+  activeCompPath: string | null;
+  showToast: (message: string, tone?: "error" | "info") => void;
+  writeProjectFile: ProjectFileWriter;
+  observeProjectFileVersion?: (path: string, version: string | null) => void;
+  recordEdit: (input: RecordEditInput) => Promise<void>;
+  reloadPreview: () => void;
+  forceReloadSdkSession?: () => void;
+  isRecordingRef?: React.RefObject<boolean>;
+}
+
+export function useFreezeFrame(options: UseFreezeFrameOptions) {
+  const optionsRef = useRef(options);
+  optionsRef.current = options;
+
+  return useCallback(async (element: TimelineElement, playhead: number) => {
+    const opts = optionsRef.current;
+    if (opts.isRecordingRef?.current) {
+      opts.showToast("Cannot edit timeline while recording", "error");
+      return;
+    }
+    const projectId = opts.projectId;
+    if (!projectId) return;
+    const path = element.sourceFile || opts.activeCompPath || "index.html";
+    try {
+      await serializeStudioFileMutations(opts.writeProjectFile, [path], async () => {
+        const result = await requestFreezeFrame({ projectId, path, element, playhead });
+        await opts.recordEdit({
+          label: "Freeze frame",
+          files: { [path]: { before: result.before, after: result.after } },
+        });
+        opts.observeProjectFileVersion?.(path, result.version);
+      });
+      opts.forceReloadSdkSession?.();
+      opts.reloadPreview();
+      opts.showToast(`Froze a 2 s still at ${playhead.toFixed(2)}s`, "info");
+    } catch (error) {
+      opts.showToast(error instanceof Error ? error.message : "Freeze frame failed", "error");
+    }
+  }, []);
+}

package/src/hooks/useGsapAwareEditing.ts

@@ -93,6 +93,7 @@ export interface UseGsapAwareEditingParams {
     next: { width: number; height: number },
     offset?: { x: number; y: number },
     restore?: () => void,
+    undoKey?: string,
   ) => Promise<void>;
   commitPositionPatchToHtml: ElementOffsetStagerDeps["commitPositionPatchToHtml"];
   // GSAP script commit ops (from useGsapScriptCommits)
@@ -394,12 +395,11 @@ export function useGsapAwareEditing({
                 makeFetchFallback(selection),
               );
               assertGsapEditPersisted(outcome);
-              cropUndoKey = coalesceKey;
-              // What the resize actually did, not what its animations suggest
-              // it would do. An element whose scale is an instant hold has a
-              // scale-group tween and still commits width/height, so guessing
-              // from the tweens withheld an offset nobody had written and the
-              // element snapped back to its authored position on every drag.
+              // Saved before the buffered GSAP writes, so their reload stays the gesture's last render.
+              if (outcome.status === "element-size")
+                await handleDomBoxSizeCommit(selection, next, undefined, undefined, coalesceKey);
+              else cropUndoKey = coalesceKey;
+              // What the resize did, not what its tweens suggest: a scale hold still commits a size.
               const ownsDragOffset =
                 outcome.status === "persisted" && outcome.ownsDragOffset === true;
               logResize("intercept-handled", {

package/src/hooks/useGsapScriptCommits.test.tsx

@@ -30,6 +30,7 @@ import type { DomEditSelection } from "../components/editor/domEditingTypes";
 import type { MutationResult } from "./gsapScriptCommitTypes";
 import { persistSdkSerialize } from "../utils/sdkCutover";
 import { applyPreviewSync, useGsapScriptCommits } from "./useGsapScriptCommits";
+import { hasStudioPendingEdits } from "../utils/studioPendingEdits";
 
 // ── applyPreviewSync (pure preview-sync decision) ────────────────────────────
 
@@ -426,6 +427,24 @@ function mockFetchResult(over: Partial<MutationResult> = {}): void {
   );
 }
 
+describe("a GSAP script commit", () => {
+  it("counts as a pending edit from its call until it lands, so a quick Cmd+Z waits for it", async () => {
+    mockFetchResult();
+    const deps = renderCommitHook();
+    let committed!: Promise<unknown>;
+    act(() => {
+      committed = deps.api.commitMutation(
+        selection,
+        { type: "remove-all-keyframes", animationId: "a" },
+        { label: "Remove all keyframes" },
+      );
+    });
+    expect(hasStudioPendingEdits()).toBe(true);
+    await act(async () => void (await committed));
+    expect(hasStudioPendingEdits()).toBe(false);
+  });
+});
+
 describe("runCommit — instantPatch wiring", () => {
   it("explains a deliberate mutation that the server safely rejected as unchanged", async () => {
     mockFetchResult({ changed: false });

package/src/hooks/useGsapScriptCommits.ts

@@ -7,6 +7,7 @@ import { applySoftReload, extractGsapScriptText } from "../utils/gsapSoftReload"
 import type { SoftReloadResult } from "../utils/gsapSoftReload";
 import { trackStudioEvent } from "../utils/studioTelemetry";
 import { serializeStudioFileMutation } from "../utils/studioFileMutationCoordinator";
+import { trackedStudioEdit } from "../utils/studioPendingEdits";
 import {
   getStudioSaveErrorMessage,
   isStudioSaveErrorAlreadyToasted,
@@ -416,20 +417,20 @@ export function useGsapScriptCommits({ projectIdRef, activeCompPath, previewIfra
       }
       return run();
     };
-    const commit: CommitMutation = (selection, mutation, options) => {
+    const commit: CommitMutation = trackedStudioEdit((selection, mutation, options) => {
       if (!activeProjectId) return Promise.resolve();
       const file = selection.sourceFile || activeCompPath || "index.html";
       return serializeCommit(file, options.serializeKey, () =>
         runCommit(activeProjectId, activeCompPath, file, selection, mutation, options),
       );
-    };
-    commit.batch = (calls, options) => {
+    }) as CommitMutation;
+    commit.batch = trackedStudioEdit((calls: CommitMutationCall[], options: CommitMutationOptions) => {
       if (!activeProjectId) return Promise.resolve();
       const file = calls[0]?.selection.sourceFile || activeCompPath || "index.html";
       return serializeCommit(file, options.serializeKey, () =>
         runBatchCommit(activeProjectId, activeCompPath, file, calls, options),
       );
-    };
+    });
     return commit;
   }, [runCommit, runBatchCommit, activeCompPath, activeProjectId, writeProjectFile]);
   const trackGsapSaveFailure = useGsapSaveFailureTelemetry(activeCompPath);