hyperframes 0.8.127 → 0.8.129

package/dist/{chunk-Q3I4JEGM.js → chunk-S7NPLFWV.js}

@@ -21,7 +21,7 @@ import {
   splitElementInHtml,
   unwrapElementsFromHtml,
   wrapElementsInHtml
-} from "./chunk-IAKZWKNV.js";
+} from "./chunk-RMHUQGRK.js";
 import {
   atomicTempPath,
   createFileAtomically,
@@ -34,7 +34,7 @@ import {
   measureAudio,
   requiredFfmpeg,
   resolveLocalAudioPath
-} from "./chunk-BE6X3G5C.js";
+} from "./chunk-QC4FJVLM.js";
 import {
   PROXY_PARAMS_VERSION,
   PROXY_PENDING_RETRY_AFTER_SECONDS,
@@ -60,11 +60,11 @@ import {
   shouldPrewarmProxy,
   waitForProxy,
   walkDir
-} from "./chunk-PZSNUSBM.js";
+} from "./chunk-TCLGPL65.js";
 import {
   findTimelineScript,
   parseGsapScriptAcorn
-} from "./chunk-RUYSBG3F.js";
+} from "./chunk-4NWOGZZS.js";
 import {
   STUDIO_MANUAL_EDITS_PATH
 } from "./chunk-KC5XXX3X.js";
@@ -81,18 +81,18 @@ import {
   motionPathPluginUrl,
   parseFps,
   sameInstant
-} from "./chunk-AGNZ2QLE.js";
+} from "./chunk-2YN64IN5.js";
 import {
   MagicString,
   VALID_CANVAS_RESOLUTIONS,
   unrollComputedTimeline
-} from "./chunk-7DPBFAYT.js";
+} from "./chunk-AVUUN2XD.js";
 import {
   AFTER_FONTS_SCRIPT_TYPE,
   addScenePartsManifest,
   deferScriptsUntilFonts,
   ensureHfIds
-} from "./chunk-OLVR6P6R.js";
+} from "./chunk-Z6B37SNM.js";
 import {
   RUNTIME_BOOTSTRAP_ATTR,
   findStartTags,
@@ -104,7 +104,7 @@ import {
   resolveRateSpec,
   sourceTimeAt,
   stripEmbeddedRuntimeScripts
-} from "./chunk-AQIS2UNW.js";
+} from "./chunk-HWKCIWQT.js";
 import {
   ProjectRootMissingError,
   folderGone,
@@ -117,7 +117,7 @@ import {
 import {
   isWithinProjectRoot,
   readProjectFile
-} from "./chunk-TPWWGKU7.js";
+} from "./chunk-ZJUKFZ2P.js";
 import {
   FFPROBE_PATH_ENV,
   findFfBinary
@@ -222,7 +222,7 @@ function stampFileHfIds(filePath) {
   }
 }
 
-// ../studio-server/dist/chunk-HY2KCPIA.js
+// ../studio-server/dist/chunk-36F5I56K.js
 import { randomUUID as randomUUID6 } from "crypto";
 import { mkdir as mkdir2, readdir as readdir3, rm as rm3, rmdir, writeFile } from "fs/promises";
 import {
@@ -906,13 +906,16 @@ function saveRecord(file, log, record) {
     closeSync2(fd);
   }
 }
+function baselineRecord(log) {
+  return {
+    type: "baseline",
+    files: Object.fromEntries(log.baseline),
+    ...log.keepsLedger && { keepsLedger: true }
+  };
+}
 function writeLog(file, log) {
   const records = [
-    {
-      type: "baseline",
-      files: Object.fromEntries(log.baseline),
-      ...log.keepsLedger && { keepsLedger: true }
-    },
+    baselineRecord(log),
     ...log.entries.map((entry) => ({ type: "entry", entry })),
     ...[...log.pins].map((id) => ({ type: "pin", id, pinned: true }))
   ];
@@ -1007,6 +1010,7 @@ function withoutHiddenPaths(log) {
   return log;
 }
 var historyFiles = (dir) => listProjectFiles(dir).filter((file) => isHistoryPath(file.path));
+var COPY_LATER_ABOVE_BYTES = 1024 ** 2;
 var sameWho = (a, b) => a.kind === b.kind && a.name === b.name;
 function splitAt(change, at, kept) {
   if (at === change.after) return [change, null];
@@ -1088,6 +1092,7 @@ var Engine = class {
   outside = null;
   /** A coalescing claim, open until another key, its idle timer, an operation, a window, or another write. */
   claimed = null;
+  adopting = /* @__PURE__ */ new Map();
   /** Per path and hash an API write left, the hash of the bytes it replaced, until walked or written past. */
   overwritten = /* @__PURE__ */ new Map();
   stopHearing;
@@ -1158,6 +1163,9 @@ var Engine = class {
       const cached = cache.get(path);
       this.tracked.set(path, { hash, stat: cached?.hash === hash ? cached.stat : "" });
     }
+    const left = this.readAdopting();
+    const unadopted = (file) => left.has(file.path) && !this.tracked.has(file.path);
+    this.adoptMediaInBackground(historyFiles(this.dir).filter(unadopted), this.now());
     this.reopenClosedWindow();
     await this.settleAll();
   }
@@ -1210,7 +1218,8 @@ var Engine = class {
   }
   async firstOpen() {
     const sweptAt = this.now();
-    for (const file of historyFiles(this.dir)) {
+    const files = historyFiles(this.dir);
+    for (const file of files.filter((file2) => file2.size <= COPY_LATER_ABOVE_BYTES)) {
       const hash = await this.storeIfPresent(file.path);
       if (this.whereFolder() !== "here") throw this.replaced();
       if (hash !== null) this.tracked.set(file.path, { hash, stat: statKey(file, sweptAt) });
@@ -1219,6 +1228,50 @@ var Engine = class {
     this.log.keepsLedger = true;
     this.persistLog();
     this.saveStatCache();
+    this.adoptMediaInBackground(
+      files.filter((file) => file.size > COPY_LATER_ABOVE_BYTES),
+      sweptAt
+    );
+  }
+  adoptMediaInBackground(files, sweptAt) {
+    let copied = Promise.resolve();
+    for (const file of files) {
+      copied = copied.then(() => this.adopt(file, sweptAt));
+      this.adopting.set(file.path, copied);
+    }
+    this.saveAdopting();
+  }
+  saveAdopting() {
+    const file = join5(this.home, "adopting.json");
+    if (!this.adopting.size) return rmSync2(file, { force: true });
+    mkdirSync4(this.home, { recursive: true });
+    replaceFileAtomically(file, JSON.stringify([...this.adopting.keys()]), 420);
+  }
+  async adopt(file, sweptAt) {
+    try {
+      if (this.whereFolder() !== "here") return;
+      const stored = await this.storeIfPresent(file.path);
+      await this.queue(async () => {
+        await this.recordAdopted(file, sweptAt, stored);
+        this.adopting.delete(file.path);
+        this.saveAdopting();
+      });
+    } catch (error) {
+      if (!(error instanceof HistoryClosedError)) this.options.onError?.(error);
+    }
+  }
+  async recordAdopted(file, sweptAt, stored) {
+    if (stored === null || this.whereFolder() !== "here") return;
+    const hash = this.blobs.has(stored) ? stored : await this.storeIfPresent(file.path);
+    if (hash === null) return;
+    const change = { path: file.path, before: null, after: hash };
+    const found = this.overwrittenBy(change, void 0, /* @__PURE__ */ new Set());
+    const start = found && this.blobs.has(found) ? found : hash;
+    this.tracked.set(file.path, { hash, stat: statKey(file, sweptAt) });
+    this.log.baseline.set(file.path, start);
+    if (start !== hash) addChange(this.outsideGroup(), file.path, start, hash);
+    this.persistLog(baselineRecord(this.log));
+    this.saveStatCache();
   }
   manifest() {
     return new Map([...this.tracked].map(([path, file]) => [path, file.hash]));
@@ -1231,6 +1284,15 @@ var Engine = class {
       return /* @__PURE__ */ new Map();
     }
   }
+  readAdopting() {
+    try {
+      return new Set(
+        JSON.parse(readFileSync6(join5(this.home, "adopting.json"), "utf-8"))
+      );
+    } catch {
+      return /* @__PURE__ */ new Set();
+    }
+  }
   saveStatCache() {
     const files = JSON.stringify(Object.fromEntries(this.tracked));
     mkdirSync4(this.home, { recursive: true });
@@ -1244,7 +1306,7 @@ var Engine = class {
     if (this.whereFolder() !== "here") return;
     const sweptAt = this.now();
     const changedAt = (file) => Math.min(sweptAt, Math.max(file.mtimeMs, file.ctimeMs));
-    const seen = historyFiles(this.dir);
+    const seen = historyFiles(this.dir).filter((file) => !this.adopting.has(file.path));
     const heard = new Map(this.overwritten);
     const present = new Set(seen.map((file) => file.path));
     const removed = [...this.tracked.keys()].filter((path) => !present.has(path)).map((path) => {
@@ -1405,6 +1467,7 @@ var Engine = class {
     clearTimeout(this.claimed?.timer);
     const timer = Number.isFinite(idleMs) ? setTimeout(() => this.background(() => this.commitClaim()), idleMs) : void 0;
     timer?.unref?.();
+    group.lastWriteAt = this.now();
     this.claimed = { group, key, timer };
     return group.changes.size ? { id: group.id } : null;
   }
@@ -1707,7 +1770,10 @@ var Engine = class {
     return {
       projectId: this.projectId,
       beginWindow: (who, label, options = {}) => this.beginWindow(who, label, options.idleMs ?? this.options.maxGroupMs ?? 3e4),
-      claim: (who, label, paths, options = {}) => this.queue(() => this.claimNow(who, label, paths, options)),
+      claim: async (who, label, paths, options = {}) => {
+        await Promise.all(paths.map((path) => this.adopting.get(this.logPath(path))));
+        return this.queue(() => this.claimNow(who, label, paths, options));
+      },
       noteChange: (path) => {
         if (!this.closed) this.noteChange(path);
       },
@@ -1773,6 +1839,7 @@ var Engine = class {
       flush: () => this.queue(() => this.settleAll()),
       replacedAtPath: () => this.whereFolder() === "replaced",
       close: () => this.closing ??= (async () => {
+        await Promise.all(this.adopting.values());
         if (this.notedTimer) clearTimeout(this.notedTimer);
         this.stopHearing?.();
         const settled = this.queue(() => this.settleAll());
@@ -2213,6 +2280,7 @@ function classifyPropertyGroup(prop) {
 }
 
 // ../parsers/dist/gsapWriterAcorn.js
+var GSAP_DEFAULT_DURATION = 0.5;
 var BUILTIN_VAR_KEYS = /* @__PURE__ */ new Set(["duration", "ease", "delay"]);
 var DROPPED_VAR_KEYS = /* @__PURE__ */ new Set([
   "onComplete",
@@ -2271,22 +2339,23 @@ function positionHoldForAnimation(animation, animations) {
   if (!animation.keyframes) return null;
   const start = knownStart(animation) ?? 0;
   if (!(start > 1e-3)) return null;
-  const first = [...animation.keyframes.keyframes].sort(
-    (left, right) => left.percentage - right.percentage
-  )[0];
-  if (!first) return null;
+  const atStart = animation.keyframes.keyframes.find((keyframe) => keyframe.percentage === 0);
+  if (!atStart) return null;
   const earlier = animations.filter((other) => {
     const otherStart = knownStart(other);
     return other !== animation && !other.global && other.targetSelector === animation.targetSelector && otherStart !== void 0 && otherStart < start - 1e-3;
   });
   const position = {};
-  for (const [property, value] of Object.entries(first.properties)) {
+  for (const [property, value] of Object.entries(atStart.properties)) {
     if (classifyPropertyGroup2(property) !== "position" || typeof value !== "number") continue;
     if (earlier.some((other) => writesProperty(other, property))) continue;
     position[property] = value;
   }
   return Object.keys(position).length > 0 ? position : null;
 }
+function authorsKeyframes(anim) {
+  return anim.keyframes !== void 0 || anim.hasUnresolvedKeyframes === true;
+}
 function mergePercentageKeyframes(keyframes) {
   const byPercentage = /* @__PURE__ */ new Map();
   for (const keyframe of keyframes) {
@@ -2430,34 +2499,27 @@ function readProvenance(node) {
 var roundPercentage = (percentage) => Math.round(percentage * 10) / 10;
 var OBJECT_ARRAY_PERCENTAGE_TOLERANCE = 2;
 function getObjectArrayKeyframeTiming(durations) {
-  const hasAuthoredDuration = durations.some((duration) => duration !== void 0);
-  if (hasAuthoredDuration) {
-    if (!durations.every(
-      (duration) => typeof duration === "number" && Number.isFinite(duration) && duration > 0
-    )) {
-      return null;
-    }
-    const totalDuration = durations.reduce((sum, duration) => sum + duration, 0);
-    let cumulative = 0;
-    return {
-      percentages: durations.map((duration) => {
-        cumulative += duration;
-        return roundPercentage(cumulative / totalDuration * 100);
-      }),
-      totalDuration
-    };
+  const steps = durations.map((duration) => duration ?? GSAP_DEFAULT_DURATION);
+  if (!steps.every(
+    (duration) => typeof duration === "number" && Number.isFinite(duration) && duration > 0
+  )) {
+    return null;
   }
-  const lastIndex = durations.length - 1;
+  const totalDuration = steps.reduce((sum, duration) => sum + duration, 0);
+  let cumulative = 0;
   return {
-    percentages: durations.map(
-      (_, index) => lastIndex > 0 ? roundPercentage(index / lastIndex * 100) : 0
-    )
+    percentages: steps.map((duration) => {
+      cumulative += duration;
+      return roundPercentage(cumulative / totalDuration * 100);
+    }),
+    totalDuration
   };
 }
 function getCompatibleObjectArrayKeyframeTiming(durations, outerDuration) {
   const timing = getObjectArrayKeyframeTiming(durations);
   if (!timing) return null;
-  if (timing.totalDuration === void 0 || outerDuration === void 0) return timing;
+  const stepsAuthorDuration = durations.some((duration) => duration !== void 0);
+  if (!stepsAuthorDuration || outerDuration === void 0) return timing;
   if (typeof outerDuration === "number" && Math.abs(outerDuration - timing.totalDuration) <= Number.EPSILON) {
     return timing;
   }
@@ -3051,6 +3113,7 @@ function parsePercentageKeyframes(node, scope, source) {
     if (typeof key !== "string") continue;
     const pctMatch = PERCENTAGE_KEY_RE.exec(key);
     if (pctMatch) {
+      if (!isPlainStep(prop.value)) return void 0;
       const percentage = Number.parseFloat(pctMatch[1] ?? "0");
       const record = objectExpressionToRecord(prop.value, scope, source);
       const properties = {};
@@ -3069,6 +3132,8 @@ function parsePercentageKeyframes(node, scope, source) {
       ease = tryResolveStringProp(prop.value, scope, source) ?? ease;
     } else if (key === "easeEach") {
       easeEach = tryResolveStringProp(prop.value, scope, source) ?? easeEach;
+    } else {
+      return void 0;
     }
   }
   keyframes.sort((a, b) => a.percentage - b.percentage);
@@ -3092,12 +3157,19 @@ function computeKeyframesTotalDuration(varsNode, scope, source) {
   }
   return getObjectArrayKeyframeTiming(durations)?.totalDuration;
 }
-var isFullyReadableStep = (el) => el?.type === "ObjectExpression" && !el.properties.some((p) => p.type === "SpreadElement");
+function staticKeyName(prop) {
+  if (prop.type !== "ObjectProperty" && prop.type !== "Property") return void 0;
+  if (prop.method || prop.kind && prop.kind !== "init") return void 0;
+  const key = prop.computed ? prop.key?.type === "Literal" && prop.key.value : prop.key?.name ?? prop.key?.value;
+  return typeof key === "string" ? key : void 0;
+}
+var isPlainObject = (node) => node?.type === "ObjectExpression" && (node.properties ?? []).every((p) => staticKeyName(p) !== void 0);
+var isPlainStep = (node) => node?.type === "Literal" || isPlainObject(node);
 function parseObjectArrayKeyframes(node, scope, source) {
   const elements = node.elements ?? [];
   const raw = [];
   for (const el of elements) {
-    if (!isFullyReadableStep(el)) return void 0;
+    if (!isPlainObject(el)) return void 0;
     const record = objectExpressionToRecord(el, scope, source);
     const properties = {};
     let duration;
@@ -3136,9 +3208,8 @@ function parseSimpleArrayKeyframes(node, scope) {
       const values = [];
       for (const el of prop.value.elements ?? []) {
         const val = resolveNode(el, scope);
-        if (typeof val === "number" || typeof val === "string") {
-          values.push(val);
-        }
+        if (typeof val !== "number" && typeof val !== "string") return void 0;
+        values.push(val);
       }
       if (values.length > 0) arrayProps.set(key, values);
     } else if (key === "ease") {
@@ -3171,6 +3242,7 @@ function parseKeyframesNode(node, scope, source) {
   }
   if (node.type !== "ObjectExpression") return void 0;
   const props = node.properties ?? [];
+  if (!props.every((p) => staticKeyName(p) !== void 0)) return void 0;
   let hasPercentageKey = false;
   let hasArrayValue = false;
   for (const prop of props) {
@@ -3271,7 +3343,7 @@ function tweenCallToAnimation(call, scope, source, identifierBindings) {
         percentage: waypoints.length > 1 ? Math.round(i / (waypoints.length - 1) * 100) : 0,
         properties: { x: wp.x, y: wp.y }
       }));
-      keyframesData = { format: "percentage", keyframes: kf };
+      keyframesData = { format: "percentage", keyframes: kf, fromMotionPath: true };
     } else {
       const kfs = keyframesData.keyframes;
       if (kfs.length === waypoints.length) {
@@ -3301,10 +3373,10 @@ function tweenCallToAnimation(call, scope, source, identifierBindings) {
   const position = typeof posVal === "number" ? posVal : typeof posVal === "string" ? posVal : hasPositionArg ? `__raw:${source.slice(call.positionArg.start, call.positionArg.end)}` : 0;
   let duration = typeof vars.duration === "number" ? vars.duration : void 0;
   const ease = typeof vars.ease === "string" ? vars.ease : void 0;
-  if (duration === void 0 && keyframesData) {
+  const durationUnresolved = call.method !== "set" && duration === void 0 && hasUnknownDuration(call.varsArg, scope);
+  if (duration === void 0 && keyframesData && !durationUnresolved) {
     duration = computeKeyframesTotalDuration(call.varsArg, scope, source);
   }
-  const durationUnresolved = call.method !== "set" && duration === void 0 && hasUnknownDuration(call.varsArg, scope);
   let selector = call.selector;
   let targetIdentity;
   if (selector === "__unresolved__") {
@@ -3358,7 +3430,6 @@ function tweenCallToAnimation(call, scope, source, identifierBindings) {
   if (provenance) anim.provenance = provenance;
   return anim;
 }
-var GSAP_DEFAULT_DURATION = 0.5;
 function resolvePositionString(pos, cursor, prevStart) {
   const trimmed = pos.trim();
   if (trimmed === "") return cursor;
@@ -3391,7 +3462,7 @@ function applyTimelineDefaults(anims, defaults) {
       if (defaults.duration !== void 0) anim.duration = defaults.duration;
       else if (defaults.durationUnresolved) anim.durationUnresolved = true;
     }
-    if (anim.ease === void 0 && defaults.ease !== void 0 && !anim.keyframes) {
+    if (anim.ease === void 0 && defaults.ease !== void 0 && (!anim.keyframes || anim.keyframes.fromMotionPath)) {
       anim.ease = defaults.ease;
     }
   }
@@ -3555,14 +3626,25 @@ function parseGsapScriptAcornForWrite(script) {
     return null;
   }
 }
-function clipTweenMatcher(clipSelectors, root) {
+function clipTweenMatcher(clipSelectors, root, queries = /* @__PURE__ */ new Map()) {
   const own = typeof clipSelectors === "string" ? [clipSelectors] : clipSelectors;
-  const clips = root ? own.flatMap((selector) => queryAll(root, selector)) : [];
+  if (!root)
+    return ({ targetSelector, hasPartialSelector }) => !hasPartialSelector && own.includes(targetSelector);
+  const queryAll = (selector) => {
+    if (ID_SELECTOR.test(selector)) {
+      if (!queries.has(ALL_IDS)) indexIds(root, queries);
+      return queries.get(selector) ?? [];
+    }
+    let found = queries.get(selector);
+    if (!found) queries.set(selector, found = queryRoot(root, selector));
+    return found;
+  };
+  const clips = own.flatMap((selector) => queryAll(selector));
   return ({ targetSelector, hasPartialSelector }) => {
     if (hasPartialSelector) return false;
     if (own.includes(targetSelector)) return true;
-    if (!root || clips.length === 0) return false;
-    const targets = queryAll(root, targetSelector);
+    if (clips.length === 0) return false;
+    const targets = queryAll(targetSelector);
     return targets.length > 0 && targets.every((target) => {
       const owner = target.closest("[data-start]");
       return clips.includes(target) || owner !== null && clips.includes(owner);
@@ -3575,7 +3657,20 @@ function clipQueryRoot(script) {
 function hasExplicitTime(animation) {
   return typeof animation.position === "number" && !animation.implicitPosition;
 }
-function queryAll(root, selector) {
+var ID_SELECTOR = /^#-?[A-Za-z_][\w-]*$/;
+var ALL_IDS = "[id]";
+function indexIds(root, queries) {
+  const all = queryRoot(root, ALL_IDS);
+  queries.set(ALL_IDS, all);
+  for (const el of all) {
+    const key = `#${el.id}`;
+    if (!ID_SELECTOR.test(key)) continue;
+    const list = queries.get(key);
+    if (list) list.push(el);
+    else queries.set(key, [el]);
+  }
+}
+function queryRoot(root, selector) {
   try {
     return Array.from(root.querySelectorAll(selector));
   } catch {
@@ -3742,7 +3837,7 @@ function updateAnimationInScript(script, animationId, updates) {
   const parsed = parseGsapScriptAcornForWrite(script);
   if (!parsed) return script;
   const target = parsed.located.find((l) => l.id === animationId);
-  if (!target) return script;
+  if (!target || updates.properties && target.animation.hasUnresolvedKeyframes) return script;
   const ms = new MagicString(script);
   const { call } = target;
   if (updates.properties) {
@@ -3805,47 +3900,56 @@ function overwritePosition(ms, call, position) {
     ms.appendLeft(last ? last.end : call.node.end - 1, `, ${valueToCode(position)}`);
   }
 }
-function shiftPositionsInScript(script, targetSelector, delta, root) {
-  const parsed = parseGsapScriptAcornForWrite(script);
-  if (!parsed) return script;
-  const carries = clipTweenMatcher(targetSelector, root);
+var isLiveRetime = (r) => r.kind === "shift" || r.oldDuration > 0 && r.newDuration > 0;
+function applyRetime(animation, retime) {
+  if (retime.kind === "shift") {
+    if (!hasExplicitTime(animation)) return { position: false, duration: false };
+    animation.position = shiftedPosition(animation.position, retime.delta);
+    return { position: true, duration: false };
+  }
+  const touched = { position: false, duration: false };
+  if (!isLiveRetime(retime) || typeof animation.position !== "number") return touched;
+  const ratio = retime.newDuration / retime.oldDuration;
+  if (hasExplicitTime(animation)) {
+    const scaled = retime.newStart + (animation.position - retime.oldStart) * ratio;
+    animation.position = Math.max(0, Math.round(scaled * 1e3) / 1e3);
+    touched.position = true;
+  }
+  if (typeof animation.duration === "number" && animation.duration > 0) {
+    animation.duration = Math.max(1e-3, Math.round(animation.duration * ratio * 1e3) / 1e3);
+    touched.duration = true;
+  }
+  return touched;
+}
+function retimeClipTweensInScript(script, retimes, root) {
+  const changed = retimes.map(() => false);
+  const parsed = retimes.some(isLiveRetime) ? parseGsapScriptAcornForWrite(script) : null;
+  if (!parsed) return { script, changed };
+  const queries = /* @__PURE__ */ new Map();
+  const matchers = retimes.map((r) => clipTweenMatcher(r.targetSelector, root, queries));
   const ms = new MagicString(script);
-  let changed = false;
+  let wrote = false;
   for (const entry of parsed.located) {
-    if (!carries(entry.animation) || !hasExplicitTime(entry.animation)) continue;
-    overwritePosition(ms, entry.call, shiftedPosition(entry.animation.position, delta));
-    changed = true;
+    const animation = { ...entry.animation };
+    let position = false;
+    let duration = false;
+    retimes.forEach((retime, i) => {
+      if (!matchers[i](animation)) return;
+      const before = [animation.position, animation.duration];
+      const touched = applyRetime(animation, retime);
+      position ||= touched.position;
+      duration ||= touched.duration;
+      if (before[0] !== animation.position || before[1] !== animation.duration) changed[i] = true;
+    });
+    if (position) overwritePosition(ms, entry.call, animation.position);
+    if (duration) upsertProp(ms, entry.call.varsArg, "duration", animation.duration);
+    wrote ||= position || duration;
   }
-  return changed ? ms.toString() : script;
+  return { script: wrote ? ms.toString() : script, changed };
 }
 function shiftedPosition(position, delta) {
   return Math.max(0, Math.round((position + delta) * 1e3) / 1e3);
 }
-function scalePositionsInScript(script, targetSelector, oldStart, oldDuration, newStart, newDuration, root) {
-  if (oldDuration <= 0 || newDuration <= 0) return script;
-  const ratio = newDuration / oldDuration;
-  const parsed = parseGsapScriptAcornForWrite(script);
-  if (!parsed) return script;
-  const carries = clipTweenMatcher(targetSelector, root);
-  const ms = new MagicString(script);
-  let changed = false;
-  for (const entry of parsed.located) {
-    if (!carries(entry.animation) || typeof entry.animation.position !== "number") continue;
-    if (hasExplicitTime(entry.animation)) {
-      const newPos = Math.max(
-        0,
-        Math.round((newStart + (entry.animation.position - oldStart) * ratio) * 1e3) / 1e3
-      );
-      overwritePosition(ms, entry.call, newPos);
-    }
-    if (typeof entry.animation.duration === "number" && entry.animation.duration > 0) {
-      const newDur = Math.max(1e-3, Math.round(entry.animation.duration * ratio * 1e3) / 1e3);
-      upsertProp(ms, entry.call.varsArg, "duration", newDur);
-    }
-    changed = true;
-  }
-  return changed ? ms.toString() : script;
-}
 function addAnimationToScript(script, animation) {
   const parsed = parseGsapScriptAcornForWrite(script);
   if (!parsed) return { script, id: "" };
@@ -4118,7 +4222,7 @@ function updateKeyframeInScript(script, animationId, percentage, properties, eas
   const parsed = parseGsapScriptAcornForWrite(script);
   if (!parsed) return script;
   const target = parsed.located.find((l) => l.id === animationId);
-  if (!target) return script;
+  if (!target || target.animation.hasUnresolvedKeyframes) return script;
   const kfPropNode = findPropertyNode2(target.call.varsArg, "keyframes");
   if (!kfPropNode) {
     return updateMotionPathKeyframe(script, target, percentage, properties, ease) ?? script;
@@ -4186,7 +4290,7 @@ function locateWithKeyframes(script, animationId) {
   if (!parsed) return null;
   const convertedId = animationId.replace(/-from-|-fromTo-/, "-to-");
   const target = parsed.located.find((l) => l.id === animationId) ?? parsed.located.find((l) => l.id === convertedId);
-  if (!target) return null;
+  if (!target || target.animation.hasUnresolvedKeyframes) return null;
   const kfPropNode = findPropertyNode2(target.call.varsArg, "keyframes");
   if (!kfPropNode || kfPropNode.value?.type !== "ObjectExpression") return null;
   return { script, parsed, target, kfNode: kfPropNode.value };
@@ -4210,8 +4314,12 @@ function convertArrayKeyframesToObject(script, target) {
     return `${JSON.stringify(`${timing.percentages[i]}%`)}: ${recordToCode(record)}`;
   });
   const ms = new MagicString(script);
-  ms.overwrite(kfPropNode.value.start, kfPropNode.value.end, `{ ${entries.join(", ")} }`);
-  if (timing.totalDuration !== void 0 && findPropertyNode2(target.call.varsArg, "duration") === void 0) {
+  ms.overwrite(
+    kfPropNode.value.start,
+    kfPropNode.value.end,
+    `{ ${entries.join(", ")}, easeEach: "none" }`
+  );
+  if (findPropertyNode2(target.call.varsArg, "duration") === void 0) {
     upsertProp(ms, target.call.varsArg, "duration", timing.totalDuration);
   }
   return ms.toString();
@@ -4221,7 +4329,7 @@ function ensureKeyframesNode(script, animationId) {
   if (direct) return direct;
   const parsed = parseGsapScriptAcornForWrite(script);
   const target = parsed?.located.find((l) => l.id === animationId);
-  if (!target) return null;
+  if (!target || target.animation.hasUnresolvedKeyframes) return null;
   const kfProp = findPropertyNode2(target.call.varsArg, "keyframes");
   if (kfProp?.value?.type === "ArrayExpression") {
     const normalized = convertArrayKeyframesToObject(script, target);
@@ -4323,7 +4431,7 @@ function removeKeyframeFromScript(script, animationId, percentage) {
   const parsed = parseGsapScriptAcornForWrite(script);
   if (!parsed) return script;
   const target = parsed.located.find((l) => l.id === animationId);
-  if (!target) return script;
+  if (!target || target.animation.hasUnresolvedKeyframes) return script;
   const kfPropNode = findPropertyNode2(target.call.varsArg, "keyframes");
   if (!kfPropNode) return script;
   if (kfPropNode.value?.type === "ArrayExpression") {
@@ -4447,7 +4555,7 @@ function convertToKeyframesFromScript(script, animationId, resolvedFromValues, s
   const target = parsed.located.find((l) => l.id === animationId);
   if (!target) return script;
   const { animation, call } = target;
-  if (animation.keyframes) return script;
+  if (authorsKeyframes(animation)) return script;
   const isSet = call.method === "set";
   const { fromProps, toProps } = resolveConversionProps(animation, resolvedFromValues);
   const ms = new MagicString(script);
@@ -4663,6 +4771,7 @@ function splitIntoPropertyGroupsFromScript(script, animationId) {
   const target = parsed.located.find((l) => l.id === animationId);
   if (!target) return { script, ids: [animationId] };
   const { animation } = target;
+  if (animation.hasUnresolvedKeyframes) return { script, ids: [animationId] };
   const allPropKeys = collectPropertyKeys(animation);
   const groupProps = partitionPropertyGroups(allPropKeys);
   if (groupProps.size <= 1) return { script, ids: [animationId] };
@@ -4937,8 +5046,8 @@ function computeForwardBaselines(matching, splitTime) {
     const pos = typeof anim.position === "number" ? anim.position : 0;
     const dur = anim.duration ?? 0;
     const animEnd = pos + dur;
-    if (anim.keyframes) {
-      const kfs = anim.keyframes.keyframes;
+    if (authorsKeyframes(anim)) {
+      const kfs = anim.keyframes?.keyframes ?? [];
       if (pos >= splitTime) {
       } else if (animEnd > splitTime) {
         for (const kf of kfs) {
@@ -4999,17 +5108,22 @@ function buildSpanningSplit(result, anim, pos, dur, fromSource, ctx) {
     extras: anim.extras
   }).script;
 }
+function applyKeyframedTweenSplit(result, anim, pos, animEnd, ctx, skippedSelectors) {
+  if (pos >= ctx.splitTime)
+    return updateAnimationSelectorInScript(result, anim.id, ctx.newSelector);
+  if (animEnd > ctx.splitTime) {
+    skippedSelectors.push(`${ctx.originalSelector} (keyframes spanning split)`);
+  } else if (anim.hasUnresolvedKeyframes) {
+    skippedSelectors.push(`${ctx.originalSelector} (unreadable keyframes before split)`);
+  }
+  return result;
+}
 function applyTweenSplit(result, anim, baselineBefore, ctx, skippedSelectors) {
   const pos = typeof anim.position === "number" ? anim.position : 0;
   const dur = anim.duration ?? 0;
   const animEnd = pos + dur;
-  if (anim.keyframes) {
-    if (pos >= ctx.splitTime)
-      return updateAnimationSelectorInScript(result, anim.id, ctx.newSelector);
-    if (animEnd > ctx.splitTime) {
-      skippedSelectors.push(`${ctx.originalSelector} (keyframes spanning split)`);
-    }
-    return result;
+  if (authorsKeyframes(anim)) {
+    return applyKeyframedTweenSplit(result, anim, pos, animEnd, ctx, skippedSelectors);
   }
   if (animEnd <= ctx.splitTime) return result;
   if (pos >= ctx.splitTime)
@@ -5956,7 +6070,7 @@ function requestSubPath(url, route) {
   return decodeURIComponent(segments.slice(start + routeSegments.length).join("/"));
 }
 async function loadGsapParser() {
-  return import("./gsapParser-LOSAMHNR.js");
+  return import("./gsapParser-DIYYX6JT.js");
 }
 function isDanglingSymlinkInProject(projectDir, lexicalPath) {
   if (!isSafePath(projectDir, dirname32(lexicalPath))) return false;
@@ -6617,7 +6731,7 @@ async function prepareGsapMutationScript(c, res, firstMutation) {
   let block = extractGsapScriptBlock(html);
   if (!block && (firstMutation.type === "add" || firstMutation.type === "add-with-keyframes")) {
     const compId = html.match(/data-composition-id="([^"]+)"/)?.[1] ?? "main";
-    const { GSAP_CDN } = await import("./dist-IPEAV427.js");
+    const { GSAP_CDN } = await import("./dist-S3PJNPXQ.js");
     const bootstrap = [
       `<script src="${GSAP_CDN}"></script>`,
       "<script>",
@@ -6649,6 +6763,38 @@ ${bootstrap}`;
   if (!block) return c.json({ error: "no GSAP script found in file" }, 400);
   return { html, beforeHtml, block };
 }
+function retimeRuns(mutations) {
+  const runs = /* @__PURE__ */ new Map();
+  let start = -1;
+  mutations.forEach((mutation, index) => {
+    const retime = clipRetimeOf(mutation);
+    if (!retime) return void (start = -1);
+    if (start < 0) runs.set(start = index, []);
+    runs.get(start).push(retime);
+  });
+  return runs;
+}
+function clipRetimeOf(mutation) {
+  if (mutation.type === "shift-positions") {
+    const { targetSelector: targetSelector2, delta } = mutation;
+    return targetSelector2 && Number.isFinite(delta) && delta !== 0 ? { kind: "shift", targetSelector: targetSelector2, delta } : "no-op";
+  }
+  if (mutation.type !== "scale-positions") return null;
+  const { targetSelector, oldStart, oldDuration, newStart, newDuration } = mutation;
+  const finite = [oldStart, oldDuration, newStart, newDuration].every(Number.isFinite);
+  if (!targetSelector || !finite || oldDuration <= 0 || newDuration <= 0) return "no-op";
+  if (oldStart === newStart && oldDuration === newDuration) return "no-op";
+  return { kind: "scale", targetSelector, oldStart, oldDuration, newStart, newDuration };
+}
+function retimeRun(script, run, root) {
+  const live = run.filter((slot) => slot !== "no-op");
+  const retimed = retimeClipTweensInScript(script, live, root);
+  const synced = syncPositionHoldsBeforeKeyframes(retimed.script);
+  let next = 0;
+  const changed = run.map((slot) => slot !== "no-op" && retimed.changed[next++]);
+  if (synced !== retimed.script) changed[changed.length - 1] = true;
+  return { script: synced, changed: synced === script ? changed.map(() => false) : changed };
+}
 async function applyGsapMutations(c, res, mutations) {
   const firstMutation = mutations[0];
   if (!firstMutation) return c.json({ error: "mutations array required" }, 400);
@@ -6667,7 +6813,17 @@ async function applyGsapMutations(c, res, mutations) {
     return c.json({ error: error instanceof Error ? error.message : String(error) }, 400);
   }
   const mutationChanges = [];
-  for (const mutation of mutations) {
+  const retimes = writer === "acorn" ? retimeRuns(mutations) : /* @__PURE__ */ new Map();
+  for (let index = 0; index < mutations.length; index++) {
+    const run = retimes.get(index);
+    if (run) {
+      const retimed = retimeRun(block.scriptText, run, block.root);
+      mutationChanges.push(...retimed.changed);
+      block.scriptText = retimed.script;
+      index += run.length - 1;
+      continue;
+    }
+    const mutation = mutations[index];
     const previousScript = block.scriptText;
     const result = await executeGsapMutation(mutation, block, respond, writer);
     if (result instanceof Response) return result;
@@ -6979,33 +7135,14 @@ function executeGsapMutationAcorn(body, block, respond) {
     case "unroll-timeline": {
       return unrollComputedTimeline(block.scriptText);
     }
-    case "shift-positions": {
-      const { targetSelector, delta } = body;
-      if (!targetSelector || !Number.isFinite(delta) || delta === 0) return block.scriptText;
-      return shiftPositionsInScript(block.scriptText, targetSelector, delta, block.root);
-    }
     case "shift-positions-batch": {
-      let script = block.scriptText;
-      for (const s of body.shifts) {
-        if (!s.targetSelector || !Number.isFinite(s.delta) || s.delta === 0) continue;
-        script = shiftPositionsInScript(script, s.targetSelector, s.delta, block.root);
-      }
-      return script;
+      const shifts = body.shifts.filter((s) => s.targetSelector && Number.isFinite(s.delta) && s.delta !== 0).map((s) => ({ kind: "shift", targetSelector: s.targetSelector, delta: s.delta }));
+      return retimeClipTweensInScript(block.scriptText, shifts, block.root).script;
     }
+    case "shift-positions":
     case "scale-positions": {
-      const { targetSelector, oldStart, oldDuration, newStart, newDuration } = body;
-      if (!targetSelector || !Number.isFinite(oldStart) || !Number.isFinite(oldDuration) || !Number.isFinite(newStart) || !Number.isFinite(newDuration) || oldDuration <= 0 || newDuration <= 0)
-        return block.scriptText;
-      if (oldStart === newStart && oldDuration === newDuration) return block.scriptText;
-      return scalePositionsInScript(
-        block.scriptText,
-        targetSelector,
-        oldStart,
-        oldDuration,
-        newStart,
-        newDuration,
-        block.root
-      );
+      const retime = clipRetimeOf(body);
+      return retime && retime !== "no-op" ? retimeClipTweensInScript(block.scriptText, [retime], block.root).script : block.scriptText;
     }
     default:
       return respond({ error: `unknown mutation type: ${body.type}` }, 400);
@@ -7304,15 +7441,15 @@ async function executeGsapMutationRecast(body, block, respond) {
     case "shift-positions": {
       const { targetSelector, delta } = body;
       if (!targetSelector || !Number.isFinite(delta) || delta === 0) return block.scriptText;
-      const { shiftPositionsInScript: shiftPositionsInScript2 } = parser;
-      return shiftPositionsInScript2(block.scriptText, targetSelector, delta, block.root);
+      const { shiftPositionsInScript } = parser;
+      return shiftPositionsInScript(block.scriptText, targetSelector, delta, block.root);
     }
     case "shift-positions-batch": {
-      const { shiftPositionsInScript: shiftPositionsInScript2 } = parser;
+      const { shiftPositionsInScript } = parser;
       let script = block.scriptText;
       for (const s of body.shifts) {
         if (!s.targetSelector || !Number.isFinite(s.delta) || s.delta === 0) continue;
-        script = shiftPositionsInScript2(script, s.targetSelector, s.delta, block.root);
+        script = shiftPositionsInScript(script, s.targetSelector, s.delta, block.root);
       }
       return script;
     }
@@ -7321,8 +7458,8 @@ async function executeGsapMutationRecast(body, block, respond) {
       if (!targetSelector || !Number.isFinite(oldStart) || !Number.isFinite(oldDuration) || !Number.isFinite(newStart) || !Number.isFinite(newDuration) || oldDuration <= 0 || newDuration <= 0)
         return block.scriptText;
       if (oldStart === newStart && oldDuration === newDuration) return block.scriptText;
-      const { scalePositionsInScript: scalePositionsInScript2 } = parser;
-      return scalePositionsInScript2(
+      const { scalePositionsInScript } = parser;
+      return scalePositionsInScript(
         block.scriptText,
         targetSelector,
         oldStart,
@@ -11059,6 +11196,12 @@ function createStudioApi(adapter) {
     const project = await Promise.resolve().then(() => adapter.resolveProject(c.req.param("id"))).catch(() => null);
     if (project) adapter.invalidateProjectSignature?.(project.dir);
   });
+  api.use("/projects/:id/*", async function openHistorySoNoWriteBecomesItsBaseline(c, next) {
+    if (c.req.method !== "GET" && c.req.method !== "HEAD" && adapter.history) {
+      await Promise.resolve().then(() => adapter.resolveProject(c.req.param("id"))).then((project) => project && adapter.history?.(project)).catch(() => null);
+    }
+    await next();
+  });
   registerProjectRoutes(api, adapter);
   registerFileRoutes(api, adapter);
   registerPreviewRoutes(api, adapter);