@hyperframes/studio 0.8.107 → 0.8.109

package/src/utils/gsapSoftReload.ts

@@ -1,6 +1,7 @@
 import { COLOR_GRADING_SOURCE_HIDDEN_ATTR } from "@hyperframes/core/color-grading";
-import { findAuthoredElement, parseSavedSource } from "./authoredSource";
+import { findAuthoredElement } from "./authoredSource";
 import { applyAuthoredInlineOpacity, readStampedAuthoredOpacity } from "./authoredOpacity";
+import { authoringFile, collectResetTargets, compositionFile, fileDocs } from "./softReloadTargets";
 
 type IframeWindow = Window & {
   __timelines?: Record<string, { kill?: () => void; pause?: () => void }>;
@@ -131,15 +132,28 @@ function verifyTimelinesPopulated(win: IframeWindow, targetKeys: string[]): bool
   return Object.keys(timelines).filter((k) => k !== "__proxied").length > 0;
 }
 
-// GSAP masks a folded CSS translate/rotate/scale with `none`; a fresh load has only what the file authors.
-function restoreAuthoredTransforms(
+// GSAP masks a folded CSS translate/rotate/scale with `none`, and a tween writes what it animates
+// inline; a fresh load has only what the file authors. Opacity has its own restore.
+function restoreAuthoredStyle(
   style: CSSStyleDeclaration,
   authored: CSSStyleDeclaration | null,
+  tweened: Set<string>,
 ) {
   style.transform = authored?.transform ?? "";
   if (!authored) return;
-  for (const prop of ["translate", "rotate", "scale"]) {
-    style.setProperty(prop, authored.getPropertyValue(prop));
+  for (const prop of ["translate", "rotate", "scale", ...tweened]) {
+    if (prop === "opacity") continue;
+    style.setProperty(prop, authored.getPropertyValue(prop), authored.getPropertyPriority(prop));
+  }
+}
+
+function runSuppressed(win: IframeWindow, reload: () => void): boolean {
+  try {
+    if (win.__hfSuppressSceneMutations) win.__hfSuppressSceneMutations(reload);
+    else reload();
+    return true;
+  } catch {
+    return false;
   }
 }
 
@@ -196,6 +210,8 @@ export interface SoftReloadOptions {
   /** After-write file HTML — the primary source for the authored opacity and transform restore. */
   authoredHtml?: string;
   reparse?: Element[];
+  /** Other composition files a reset element is written in, by path; null when one could not be read. */
+  nestedFiles?: Map<string, string> | null;
 }
 
 /**
@@ -247,6 +263,12 @@ export function applySoftReloadFinalization(
   }
 }
 
+function timelineKeys(scriptText: string): string[] {
+  return [...scriptText.matchAll(/__timelines\s*\[\s*["'`]([^"'`]+)["'`]\s*\]/g)]
+    .map((m) => m[1]!)
+    .filter((key) => key !== "__proxied");
+}
+
 export function applySoftReload(
   iframe: HTMLIFrameElement | null,
   scriptText: string,
@@ -259,6 +281,8 @@ export function applySoftReload(
   const doc = iframe.contentDocument;
   if (!win || !doc) return "cannot-soft-reload";
   if (!win.gsap || !win.__hfForceTimelineRebind) return "cannot-soft-reload";
+  // Without the file an element is written in, only a full load restores it.
+  if (options.nestedFiles === null) return "cannot-soft-reload";
 
   // Which composition(s) does this script rebuild? A soft reload re-runs ONE
   // composition's GSAP script, which re-registers its own window.__timelines[key].
@@ -267,9 +291,7 @@ export function applySoftReload(
   // of the global timeline — so tearing down ALL of them (or the global timeline's
   // children) and re-running a single script wipes every OTHER composition,
   // reverting its edits. Scope the teardown to the keys THIS script re-registers.
-  const targetKeys = [...scriptText.matchAll(/__timelines\s*\[\s*["'`]([^"'`]+)["'`]\s*\]/g)]
-    .map((m) => m[1]!)
-    .filter((key) => key !== "__proxied");
+  const targetKeys = timelineKeys(scriptText);
   if (targetKeys.length === 0) return "cannot-soft-reload"; // can't scope safely → full reload
   const gsapScripts = findGsapScriptElements(doc);
   if (gsapScripts.length === 0) return "cannot-soft-reload";
@@ -302,6 +324,7 @@ export function applySoftReload(
   // once the plugin loads; the alternative (returning false) would trigger a
   // full iframe reload that destroys the very WebGL context we're preserving.
   let deferredToAsync = false;
+  let builtDom = false;
 
   // Authored-opacity resolution for the restore loop below. Three-state:
   //   "0.98" — the element's authored inline opacity
@@ -311,16 +334,10 @@ export function applySoftReload(
   // The just-written file (`authoredHtml`) is the current truth; the runtime's
   // parse-time stamp (data-hf-authored-opacity, installAuthoredOpacityCapture)
   // covers elements the file lookup can't resolve. Parsed lazily, at most once.
-  let authoredDoc: Document | null | undefined;
+  const docFor = fileDocs(compositionFile(doc, targetKeys), authoredHtml, options.nestedFiles);
   const findAuthoredStyle = (el: HTMLElement): CSSStyleDeclaration | null => {
-    if (authoredDoc === undefined) {
-      try {
-        authoredDoc = authoredHtml ? parseSavedSource(authoredHtml) : null;
-      } catch {
-        authoredDoc = null;
-      }
-    }
-    const source = authoredDoc ? findAuthoredElement(authoredDoc, el) : null;
+    const fileDoc = docFor(authoringFile(el));
+    const source = fileDoc ? findAuthoredElement(fileDoc, el) : null;
     // The parsed file lives in this realm, so instanceof holds here, unlike for the iframe nodes below.
     return source instanceof HTMLElement || source instanceof SVGElement ? source.style : null;
   };
@@ -330,29 +347,14 @@ export function applySoftReload(
   // fallow-ignore-next-line complexity
   const doReload = () => {
     const timelines = win.__timelines;
-    const allTargets: Element[] = [...reparse];
+    const targets = collectResetTargets(win, doc, targetKeys, reparse);
 
     // Kill ONLY the target composition's timeline(s) — leaving every other
     // composition's timeline (and its children on the global timeline) intact.
     if (timelines) {
       for (const key of targetKeys) {
-        const tl = timelines[key] as
-          | {
-              kill?: () => void;
-              clear?: () => void;
-              getChildren?: (deep: boolean) => Array<{ targets?: () => Element[] }>;
-            }
-          | undefined;
+        const tl = timelines[key] as { kill?: () => void; clear?: () => void } | undefined;
         if (!tl) continue;
-        if (tl.getChildren) {
-          try {
-            for (const child of tl.getChildren(true)) {
-              if (typeof child.targets === "function") {
-                for (const t of child.targets()) allTargets.push(t);
-              }
-            }
-          } catch {}
-        }
         try {
           // kill() keeps the children, and the finalize seek renders this timeline until the rebind swaps it.
           tl.clear?.();
@@ -362,29 +364,11 @@ export function applySoftReload(
       }
     }
 
-    // Also reset elements carrying a GSAP-applied inline `transform` that the
-    // timeline-children sweep above missed — a dragged element whose position
-    // was a standalone `gsap.set` (never a timeline child), or one whose
-    // keyframes were just removed (no longer in any timeline). Their last
-    // `gsap.set` transform is otherwise orphaned: the re-run won't re-set it
-    // and the sweep above can't see it, so the element renders offset from its
-    // source position (matching the overlay) until a full reload. The clear
-    // below runs BEFORE the re-run, which re-applies the transform for any
-    // element the new script still animates.
-    const seenTargets = new Set<Element>(allTargets);
-    for (const el of doc.querySelectorAll<HTMLElement>("[style*='transform']")) {
-      // Gate on the GSAP cache (`_gsap`) so we only reset transforms GSAP owns —
-      // never strip an authored, non-GSAP inline transform.
-      if (el.style.transform && "_gsap" in el && !seenTargets.has(el)) {
-        seenTargets.add(el);
-        allTargets.push(el);
-      }
-    }
-
     // Reset GSAP's internal transform cache so from() tweens don't read stale
     // end values. `clearProps: "all"` is needed to flush the cache, but it also
     // nukes the element's CSS base (position, width, height, etc.) from the
-    // HTML `style=""` attribute. Save → clear → restore → authored transform props.
+    // HTML `style=""` attribute. Save → clear → restore → what GSAP wrote, from the file.
+    const allTargets = [...targets.keys()];
     if (allTargets.length > 0 && win.gsap?.set) {
       const saved: Array<[HTMLElement, string]> = [];
       for (const el of allTargets) {
@@ -399,7 +383,7 @@ export function applySoftReload(
       for (const [el, css] of saved) {
         const s = el.style;
         s.cssText = css;
-        restoreAuthoredTransforms(s, findAuthoredStyle(el));
+        restoreAuthoredStyle(s, findAuthoredStyle(el), targets.get(el)!);
         // The restored cssText carries RUNTIME opacity, not authored opacity:
         // a mid-flight tween's interpolated value, or the color-grading hide
         // (`opacity: 0 !important`). The re-run script's tweens re-initialize
@@ -430,7 +414,14 @@ export function applySoftReload(
       }
       const s = doc.createElement("script");
       s.textContent = `(function(){${scriptText}\n})();`;
+      const ownScriptNode = 1;
+      const before = doc.body.querySelectorAll("*").length + ownScriptNode;
       doc.body.appendChild(s);
+      // A script that builds DOM builds it again on every run; only a full load starts from the file.
+      // Not seen: text-only writes, nodes put in the head or a shadow root, nodes added
+      // later, and a builder that removes its old nodes first (which needs no full load).
+      builtDom = doc.body.querySelectorAll("*").length > before;
+      if (builtDom && deferredToAsync) onAsyncFailure?.();
       finalizeSoftReload(win, currentTime);
     };
 
@@ -479,23 +470,47 @@ export function applySoftReload(
     executeScript();
   };
 
-  try {
-    if (win.__hfSuppressSceneMutations) {
-      win.__hfSuppressSceneMutations(doReload);
-    } else {
-      doReload();
-    }
-    // When MotionPath needs async loading, the script hasn't executed yet —
-    // skip the __timelines check and report success optimistically (the script
-    // WILL run on plugin load; onAsyncFailure covers the CDN-error case).
-    if (deferredToAsync) return "applied";
-    // The re-run executed. If the target keys read back, we're done; otherwise
-    // it's the TRANSIENT empty-timeline window (live state is correct) — surfaced
-    // as "verify-failed" so callers know NOT to escalate.
-    return verifyTimelinesPopulated(win, targetKeys) ? "applied" : "verify-failed";
-  } catch {
-    // The synchronous re-run threw — the preview is now genuinely broken (target
-    // timeline killed, script not re-registered). Escalate to a full reload.
-    return "cannot-soft-reload";
-  }
+  const run = () => runSuppressed(win, doReload);
+  // The synchronous re-run threw or built DOM a second time: the preview is now
+  // genuinely broken (no timeline, or duplicated nodes). Escalate to a full reload.
+  if (!run() || builtDom) return "cannot-soft-reload";
+  // When MotionPath needs async loading, the script hasn't executed yet —
+  // skip the __timelines check and report success optimistically (the script
+  // WILL run on plugin load; onAsyncFailure covers the CDN-error case).
+  if (deferredToAsync) return "applied";
+  // The re-run executed. If the target keys read back, we're done; otherwise
+  // it's the TRANSIENT empty-timeline window (live state is correct) — surfaced
+  // as "verify-failed" so callers know NOT to escalate.
+  return verifyTimelinesPopulated(win, targetKeys) ? "applied" : "verify-failed";
+}
+
+/** Other composition files for a soft reload: undefined when none are needed, null when a read failed. */
+export type NestedFiles = Map<string, string> | null | undefined;
+
+export async function settleNestedReads(
+  reads: Promise<Map<string, string>> | null,
+): Promise<NestedFiles> {
+  return reads ? reads.catch(() => null) : undefined;
+}
+
+/**
+ * Reads the composition files, other than the reloaded one, that the elements `scriptText`'s
+ * re-run resets are written in; null when there are none. Read them before the soft reload.
+ */
+export function readNestedFiles(
+  iframe: HTMLIFrameElement | null,
+  scriptText: string,
+  readFile: (path: string) => Promise<string>,
+): Promise<Map<string, string>> | null {
+  const win = iframe?.contentWindow as IframeWindow | null;
+  const doc = iframe?.contentDocument;
+  if (!win || !doc) return null;
+  const keys = timelineKeys(scriptText);
+  const own = compositionFile(doc, keys);
+  const files = [...collectResetTargets(win, doc, keys).keys()].map(authoringFile);
+  const paths = [...new Set(files)].filter((file): file is string => file !== null && file !== own);
+  if (paths.length === 0) return null;
+  return Promise.all(paths.map((path) => readFile(path))).then(
+    (texts) => new Map(paths.map((path, i) => [path, texts[i]!])),
+  );
 }

package/src/utils/gsapUndoRestore.test.ts

@@ -170,9 +170,10 @@ describe("applyUndoRestoreToPreview", () => {
 
   describe("an undo that re-runs a changed script matches a fresh load of the restored file", () => {
     const script = (extra: string) => `window.__timelines["root"]=gsap.timeline();${extra}`;
+    const root = (body: string) => `<div data-composition-id="root">${body}</div>`;
     const undoScriptEdit = (live: string, authored: string, edit: string) => {
       const { iframe, contentWindow, doc } = buildLiveIframe(
-        `${live}<script>${script(edit)}</script>`,
+        `${root(live)}<script>${script(edit)}</script>`,
       );
       const clearProps = (targets: HTMLElement[]) =>
         targets.forEach((t) => t.removeAttribute("style"));
@@ -180,8 +181,8 @@ describe("applyUndoRestoreToPreview", () => {
       for (const el of doc.querySelectorAll("[style*=transform]")) Object.assign(el, { _gsap: {} });
       const files = {
         [ROOT]: {
-          previous: wrap(`${authored}<script>${script(edit)}</script>`),
-          restored: wrap(`${authored}<script>${script("")}</script>`),
+          previous: wrap(`${root(authored)}<script>${script(edit)}</script>`),
+          restored: wrap(`${root(authored)}<script>${script("")}</script>`),
         },
       };
       expect(applyUndoRestoreToPreview(iframe, ROOT, files, 3, vi.fn())).toBe("soft");

package/src/utils/gsapUndoRestore.ts

@@ -7,6 +7,7 @@ import {
   applySoftReloadFinalization,
   extractGsapScriptText,
   findGsapScriptElements,
+  readNestedFiles,
 } from "./gsapSoftReload";
 import { isCompositionTemplate } from "@hyperframes/parsers/hf-ids";
 import { findAuthoredElement, parseSavedSource } from "./authoredSource";
@@ -324,6 +325,18 @@ export function showRestoreInPlace(
   return null;
 }
 
+/** The other composition files a re-run of the restored script resets elements of; null when none. */
+export function readUndoNestedFiles(
+  iframe: HTMLIFrameElement | null,
+  activeCompPath: string | null,
+  files: RestoreFiles | undefined,
+  readFile: (path: string) => Promise<string>,
+): Promise<Map<string, string>> | null {
+  const active = files?.[activeCompPath ?? "index.html"];
+  const script = active ? extractGsapScriptText(active.restored) : null;
+  return script ? readNestedFiles(iframe, script, readFile) : null;
+}
+
 /**
  * Soft-apply an undo/redo restore to the live preview WITHOUT a full iframe
  * remount (which blanks the frame black and re-flashes the WebGL context). Eligible
@@ -358,6 +371,7 @@ export function applyUndoRestoreToPreview(
   files: RestoreFiles | undefined,
   currentTime: number,
   reload: () => void,
+  nestedFiles?: Map<string, string> | null,
 ): "soft" | "full" {
   // The master view carries a NULL activeCompPath but the root iframe shows
   // index.html — the codebase-wide convention (`activeCompPath || "index.html"`).
@@ -398,6 +412,7 @@ export function applyUndoRestoreToPreview(
       currentTimeOverride: currentTime,
       authoredHtml: active.restored,
       reparse,
+      nestedFiles,
     });
     if (result === "cannot-soft-reload") {
       reloadPreview();

package/src/utils/linkedClipPreferences.ts

@@ -0,0 +1,34 @@
+import { create } from "zustand";
+import { STUDIO_PREVIEW_FPS } from "../player/lib/time";
+import { readStudioUiPreferences, writeStudioUiPreferences } from "./studioUiPreferences";
+
+interface LinkedClipPreferences {
+  /** Premiere's Linked Selection: clicks and edits reach every link partner. */
+  linkedSelection: boolean;
+  setLinkedSelection: (enabled: boolean) => void;
+  /** Red offset badges on a video and audio from one source that drifted apart. */
+  syncIndicatorsVisible: boolean;
+  setSyncIndicatorsVisible: (visible: boolean) => void;
+  compositionFps: number;
+  setCompositionFps: (fps: number) => void;
+}
+
+export const useLinkedClipPreferences = create<LinkedClipPreferences>((set) => ({
+  linkedSelection: readStudioUiPreferences().linkedSelectionEnabled ?? true,
+  setLinkedSelection: (enabled) => {
+    writeStudioUiPreferences({ linkedSelectionEnabled: enabled });
+    set({ linkedSelection: enabled });
+  },
+  syncIndicatorsVisible: readStudioUiPreferences().syncIndicatorsVisible ?? true,
+  setSyncIndicatorsVisible: (visible) => {
+    writeStudioUiPreferences({ syncIndicatorsVisible: visible });
+    set({ syncIndicatorsVisible: visible });
+  },
+  compositionFps: STUDIO_PREVIEW_FPS,
+  setCompositionFps: (fps) => {
+    if (Number.isFinite(fps) && fps > 0) set({ compositionFps: fps });
+  },
+}));
+
+export const isLinkedSelectionOn = (): boolean =>
+  useLinkedClipPreferences.getState().linkedSelection;

package/src/utils/previewRelativePath.ts

@@ -0,0 +1,19 @@
+import { buildProjectApiPath } from "./projectRouting";
+
+/** Resolve a media src to its project-relative preview path, or null. */
+export function resolvePreviewRelative(
+  src: string | undefined,
+  pid: string,
+  origin: string,
+): string | null {
+  if (!src) return null;
+  try {
+    const parsed = new URL(src, origin);
+    const base = new URL(buildProjectApiPath(pid, `/preview/`), origin).pathname;
+    return parsed.pathname.startsWith(base)
+      ? decodeURIComponent(parsed.pathname.slice(base.length))
+      : null;
+  } catch {
+    return null;
+  }
+}

package/src/utils/softReloadTargets.ts

@@ -0,0 +1,128 @@
+// Which elements a GSAP soft reload resets, what their tweens wrote, and which file writes each.
+import { parseSavedSource } from "./authoredSource";
+
+type TweenLike = {
+  targets?: () => Element[];
+  vars?: Record<string, unknown>;
+  getChildren?: (deep: boolean) => TweenLike[];
+};
+
+const NESTED_VARS = new Set(["css", "startAt", "keyframes"]);
+
+// The CSS names a tween's vars write; GSAP's own keys (ease, duration) are not CSS and restore as no-ops.
+function tweenedProps(vars: unknown): string[] {
+  if (!vars || typeof vars !== "object") return [];
+  return Object.entries(vars).flatMap(([key, value]) => [
+    key.replace(/[A-Z]/g, (c) => `-${c.toLowerCase()}`),
+    ...(NESTED_VARS.has(key) || /^\d|%$/.test(key) ? tweenedProps(value) : []),
+  ]);
+}
+
+// A nested composition's timeline sits inside the root one but only its own script rebuilds it.
+function ownTweens(tl: TweenLike, nested: Set<unknown>): TweenLike[] {
+  return (tl.getChildren?.(false) ?? []).flatMap((child) => {
+    if (nested.has(child)) return [];
+    return child.getChildren ? ownTweens(child, nested) : [child];
+  });
+}
+
+// The preview marks each inlined composition's host with its file; the host itself is the parent's.
+export function authoringFile(el: Element): string | null {
+  return (
+    el.parentElement?.closest("[data-composition-file]")?.getAttribute("data-composition-file") ??
+    null
+  );
+}
+
+function addTweenTargets(tween: TweenLike, targets: Map<Element, Set<string>>): void {
+  const props = tweenedProps(tween.vars);
+  for (const el of tween.targets?.() ?? []) {
+    const seen = targets.get(el) ?? new Set<string>();
+    for (const prop of props) seen.add(prop);
+    targets.set(el, seen);
+  }
+}
+
+/** Each element the re-run rebuilds, with the CSS names its killed tweens wrote. */
+export function collectResetTargets(
+  win: { __timelines?: Record<string, unknown> },
+  doc: Document,
+  targetKeys: string[],
+  reparse: Element[] = [],
+): Map<Element, Set<string>> {
+  // Elements the caller needs GSAP to parse again, with nothing tweened yet.
+  const targets = new Map<Element, Set<string>>(reparse.map((el) => [el, new Set<string>()]));
+  const timelines = (win.__timelines ?? {}) as Record<string, TweenLike | undefined>;
+  const others = new Set<unknown>(
+    Object.entries(timelines).flatMap(([key, tl]) => (targetKeys.includes(key) ? [] : [tl])),
+  );
+  for (const key of targetKeys) {
+    try {
+      for (const tween of ownTweens(timelines[key] ?? {}, others)) addTweenTargets(tween, targets);
+    } catch {}
+  }
+  sweepHeldElements(doc, targetKeys, others, targets);
+  return targets;
+}
+
+function tweenTargetsIn(timelines: Set<unknown>): Set<Element> {
+  const els = new Set<Element>();
+  for (const tl of timelines) {
+    try {
+      for (const tween of (tl as TweenLike | undefined)?.getChildren?.(true) ?? []) {
+        for (const el of tween.targets?.() ?? []) els.add(el);
+      }
+    } catch {}
+  }
+  return els;
+}
+
+function compositionRoot(doc: Document, key: string): Element | undefined {
+  return doc.querySelectorAll(`[data-composition-id="${CSS.escape(key)}"]`)[0];
+}
+
+export function compositionFile(doc: Document, targetKeys: string[]): string | null {
+  const root = targetKeys.map((key) => compositionRoot(doc, key)).find(Boolean);
+  return root?.closest("[data-composition-file]")?.getAttribute("data-composition-file") ?? null;
+}
+
+// A standalone gsap.set, or keyframes just removed, leaves GSAP state no timeline child shows.
+// The nearest composition root says whose script set it; another timeline's targets stay its own.
+function sweepHeldElements(
+  doc: Document,
+  targetKeys: string[],
+  others: Set<unknown>,
+  targets: Map<Element, Set<string>>,
+): void {
+  const elsewhere = tweenTargetsIn(others);
+  const roots = new Set<Element | null | undefined>(targetKeys.map((k) => compositionRoot(doc, k)));
+  roots.delete(undefined);
+  for (const root of roots) {
+    for (const el of root ? [root, ...root.querySelectorAll("*")] : []) {
+      if (targets.has(el) || elsewhere.has(el) || !("_gsap" in el)) continue;
+      if (el === root || roots.has(el.parentElement?.closest("[data-composition-id]")))
+        targets.set(el, new Set());
+    }
+  }
+}
+
+// Each file a reset element may be written in, parsed at most once per reload: the reloaded
+// composition's own file is the one just written, any other comes from the caller.
+export function fileDocs(
+  ownFile: string | null,
+  written: string | undefined,
+  nestedFiles: Map<string, string> | null | undefined,
+): (file: string | null) => Document | null {
+  const docs = new Map<string | null, Document | null>();
+  return (file) => {
+    if (!docs.has(file)) {
+      const text = file === ownFile ? written : nestedFiles?.get(file ?? "");
+      try {
+        docs.set(file, text ? parseSavedSource(text) : null);
+      } catch {
+        docs.set(file, null);
+      }
+    }
+    return docs.get(file) ?? null;
+  };
+}

package/src/utils/sourcePatcher.ts

@@ -21,7 +21,7 @@ export function escapeHtmlAttribute(value: string): string {
 }
 
 /** Reverse escapeHtmlAttribute so callers get the original value. */
-function unescapeHtmlAttribute(value: string): string {
+export function unescapeHtmlAttribute(value: string): string {
   return value
     .replace(/"/g, '"')
     .replace(/&lt;/g, "<")

package/src/utils/studioPendingEdits.test.ts

@@ -2,8 +2,10 @@
 import { describe, expect, it, vi } from "vitest";
 import {
   addStudioPendingEditFlushListener,
+  beginStudioPendingEdit,
   flushStudioPendingEdits,
   hasStudioPendingEdits,
+  revertNewestStudioPendingEdit,
   trackStudioPendingEdit,
   trackedStudioEdit,
 } from "./studioPendingEdits";
@@ -211,3 +213,67 @@ describe("trackedStudioEdit", () => {
     expect(hasStudioPendingEdits()).toBe(false);
   });
 });
+
+describe("a pending edit undo can paint back", () => {
+  const shown: string[] = [];
+  const edit = (name: string) =>
+    beginStudioPendingEdit(() => {
+      shown.push(`${name} undone`);
+      return () => shown.push(`${name} again`);
+    });
+
+  it("paints back only the newest edit, once, and shows it again on request", () => {
+    shown.length = 0;
+    const first = edit("first");
+    const second = edit("second");
+    const again = revertNewestStudioPendingEdit();
+    expect(shown).toEqual(["second undone"]);
+    expect(second.reverted()).toBe(true);
+    expect(first.reverted()).toBe(false);
+    expect(revertNewestStudioPendingEdit()).toBeNull();
+    again!();
+    expect(shown).toEqual(["second undone", "second again"]);
+    first.settle();
+    second.settle();
+  });
+
+  it("paints nothing when the newest edit has no revert", async () => {
+    shown.length = 0;
+    const move = edit("move");
+    let saved!: () => void;
+    trackStudioPendingEdit(new Promise<void>((resolve) => (saved = resolve)));
+    expect(revertNewestStudioPendingEdit()).toBeNull();
+    expect(shown).toEqual([]);
+    saved();
+    move.settle();
+    await flushStudioPendingEdits();
+  });
+
+  it("counts what the edit starts inside adopt as that edit, not a newer one", async () => {
+    shown.length = 0;
+    const move = edit("move");
+    let saved!: () => void;
+    const save = move.adopt(() =>
+      trackStudioPendingEdit(new Promise<void>((resolve) => (saved = resolve))),
+    );
+    move.settle(save);
+    revertNewestStudioPendingEdit();
+    expect(shown).toEqual(["move undone"]);
+    saved();
+    await expect(flushStudioPendingEdits()).resolves.toEqual({ status: "clean" });
+    expect(hasStudioPendingEdits()).toBe(false);
+  });
+});
+
+describe("a pending edit whose start throws", () => {
+  it("ends, so undo and export never wait on it", async () => {
+    const edit = beginStudioPendingEdit(null);
+    expect(() =>
+      edit.adopt(() => {
+        throw new Error("The commit threw.");
+      }),
+    ).toThrow("The commit threw.");
+    await expect(flushStudioPendingEdits()).resolves.toEqual({ status: "clean" });
+    expect(hasStudioPendingEdits()).toBe(false);
+  });
+});