@@ -19,6 +19,7 @@ import {
   type RuntimeTween,
   type RuntimeTimeline,
 } from "./gsapRuntimeKeyframes";
+import { recordLiveSet } from "../utils/softReloadTargets";
 
 /** Value-only channels a `tl.set(...)` patch may touch. */
 export interface SetPatchProps {
@@ -101,6 +102,7 @@ function applyGlobalSet(
     const numeric = finiteNumericProps(props);
     if (!gsapLib?.set || !el || !numeric) return false;
     gsapLib.set(el, numeric);
+    recordLiveSet(el, numeric);
     return true;
   } catch {
     return false;
 
@@ -1,4 +1,3 @@
-// fallow-ignore-file code-duplication
 // @vitest-environment happy-dom
 import { act } from "react";
 import { createRoot } from "react-dom/client";
@@ -12,7 +11,6 @@ const patchRuntimeTweenInPlace = vi.fn<(...args: unknown[]) => boolean>();
 const applySoftReload = vi.fn<(...args: unknown[]) => string>();
 const trackStudioEvent = vi.fn();
 const readNestedFiles = vi.fn<(...args: unknown[]) => unknown>(() => null);
-const noteScriptWritten = vi.fn();
 
 vi.mock("./gsapRuntimePatch", () => ({
   patchRuntimeTweenInPlace: (...args: unknown[]) => patchRuntimeTweenInPlace(...args),
@@ -22,7 +20,6 @@ vi.mock("../utils/gsapSoftReload", async (importOriginal) => ({
   applySoftReload: (...args: unknown[]) => applySoftReload(...args),
   extractGsapScriptText: () => "",
   readNestedFiles: (...args: unknown[]) => readNestedFiles(...args),
-  noteScriptWritten: (...args: unknown[]) => noteScriptWritten(...args),
 }));
 vi.mock("../utils/studioTelemetry", () => ({
   trackStudioEvent: (...args: unknown[]) => trackStudioEvent(...args),
@@ -81,7 +78,6 @@ describe("applyPreviewSync", () => {
   beforeEach(() => {
     patchRuntimeTweenInPlace.mockReset();
     applySoftReload.mockReset();
-    noteScriptWritten.mockReset();
     trackStudioEvent.mockReset();
   });
 
@@ -695,7 +691,6 @@ describe("runCommit — instantPatch wiring", () => {
   beforeEach(() => {
     patchRuntimeTweenInPlace.mockReset();
     applySoftReload.mockReset();
-    noteScriptWritten.mockReset();
     trackStudioEvent.mockReset();
     readNestedFiles.mockReset().mockReturnValue(null);
   });
@@ -748,19 +743,6 @@ describe("runCommit — instantPatch wiring", () => {
     expect(trackStudioEvent.mock.calls.filter(([event]) => event === "keyframe")).toEqual([]);
   });
 
-  it("notes the script a commit wrote though it skips the reload, so the next one clears its sets", async () => {
-    const written = 'gsap.set("#a", { width: 300 });';
-    mockFetchResult({ scriptText: written });
-    const deps = renderCommitHook();
-    await deps.api.commitMutation(
-      selection,
-      { type: "set" },
-      { label: "Resize", skipReload: true },
-    );
-    expect(noteScriptWritten).toHaveBeenCalledWith(FAKE_IFRAME, written);
-    expect(applySoftReload).not.toHaveBeenCalled();
-  });
-
   it("does not count a failed write that skipReload suppresses", async () => {
     vi.stubGlobal(
       "fetch",
 
@@ -6,7 +6,6 @@ import { usePlayerStore } from "../player/store/playerStore";
 import {
   applySoftReload,
   extractGsapScriptText,
-  noteScriptWritten,
   readNestedFiles,
   settleNestedReads,
 } from "../utils/gsapSoftReload";
@@ -176,7 +175,6 @@ function syncCommittedGsapMutation({
   nestedFiles?: Map<string, string> | null;
 }): void {
   if (result.after != null) onFileContentChanged?.(targetPath, result.after);
-  noteScriptWritten(iframe, result.scriptText);
   // Server wrote the file; the in-memory SDK doc is now stale. Resync it so a
   // later SDK-routed edit doesn't serialize the pre-write doc and revert this.
   forceReloadSdkSession?.();
 
@@ -1,6 +1,7 @@
 // fallow-ignore-file code-duplication
 // @vitest-environment happy-dom
 
+import { patchRuntimeTweenInPlace } from "../hooks/gsapRuntimePatch";
 import { afterEach, describe, it, expect, vi } from "vitest";
 import {
   readNestedFiles,
@@ -962,3 +963,41 @@ describe("applySoftReload over a composition's own markup", () => {
     expect(applySoftReload(iframe, SCRIPT_TEXT)).toBe("cannot-soft-reload");
   });
 });
+
+describe("a gsap.set a live patch applied", () => {
+  it("is cleared by the next soft reload once the new script no longer sets it, and only once", () => {
+    const markup = `<div data-composition-id="root"><div id="a" style="left: 10px"></div></div>`;
+    const doc = document.implementation.createHTMLDocument("");
+    doc.body.innerHTML = `${markup}<script>window.__timelines["root"]=gsap.timeline();</script>`;
+    const set = (target: HTMLElement | HTMLElement[], vars: Record<string, unknown>) => {
+      for (const el of [target].flat()) {
+        if (vars.clearProps) el.removeAttribute("style");
+        else for (const [k, v] of Object.entries(vars)) el.style.setProperty(k, `${v}px`);
+      }
+    };
+    const iframe = {
+      contentDocument: doc,
+      contentWindow: {
+        gsap: { timeline: () => {}, set },
+        __hfForceTimelineRebind: () => {},
+        __timelines: {},
+        __player: { getTime: () => 0, seek: () => {} },
+      },
+    } as unknown as HTMLIFrameElement;
+    const el = doc.getElementById("a")!;
+    const reload = () => {
+      const script = `window.__timelines["root"]=gsap.timeline();gsap.set("#a",{width:300});`;
+      applySoftReload(iframe, script, { authoredHtml: `${markup}<script>${script}</script>` });
+    };
+
+    // W 300, then H 200, then a commit that removes height from the set.
+    patchRuntimeTweenInPlace(iframe, "#a", { kind: "global-set", props: { width: 300 } });
+    patchRuntimeTweenInPlace(iframe, "#a", { kind: "global-set", props: { height: 200 } });
+    reload();
+    expect([el.style.height, el.style.left]).toEqual(["", "10px"]);
+
+    el.style.height = "50px";
+    reload();
+    expect(el.style.height).toBe("50px");
+  });
+});
@@ -2,7 +2,13 @@ import { COLOR_GRADING_SOURCE_HIDDEN_ATTR } from "@hyperframes/core/color-gradin
 import { motionPathPluginUrl } from "@hyperframes/core/gsap-cdn";
 import { findAuthoredElement } from "./authoredSource";
 import { applyAuthoredInlineOpacity, readStampedAuthoredOpacity } from "./authoredOpacity";
-import { authoringFile, collectResetTargets, compositionFile, fileDocs } from "./softReloadTargets";
+import {
+  authoringFile,
+  collectResetTargets,
+  compositionFile,
+  fileDocs,
+  forgetLiveSets,
+} from "./softReloadTargets";
 
 type IframeWindow = Window & {
   __timelines?: Record<string, { kill?: () => void; pause?: () => void }>;
@@ -228,19 +234,6 @@ export interface SoftReloadOptions {
   nestedFiles?: Map<string, string> | null;
 }
 
-// The first and latest script written since the preview last ran one; a live patch applies its sets.
-const writtenUnrun = new WeakMap<Element, [string, string]>();
-
-export function noteScriptWritten(
-  iframe: HTMLIFrameElement | null,
-  scriptText?: string | null,
-): void {
-  const doc = iframe?.contentDocument;
-  if (!doc || !scriptText?.includes("gsap.set(")) return;
-  for (const script of scriptsRegistering(findGsapScriptElements(doc), timelineKeys(scriptText)))
-    writtenUnrun.set(script, [writtenUnrun.get(script)?.[0] ?? scriptText, scriptText]);
-}
-
 /**
  * The soft reload's finalization step, shared with the rebind-only preview sync
  * below: seek → force timeline rebind → reapply studio manual edits.
@@ -383,11 +376,12 @@ export function applySoftReload(
   // fallow-ignore-next-line complexity
   const doReload = () => {
     const timelines = win.__timelines;
-    const outgoing = staleScripts.flatMap((s) => [
-      s.textContent ?? "",
-      ...(writtenUnrun.get(s) ?? []),
-    ]);
-    const targets = collectResetTargets(win, doc, targetKeys, [...new Set(outgoing)]);
+    const targets = collectResetTargets(
+      win,
+      doc,
+      targetKeys,
+      staleScripts.map((script) => script.textContent ?? ""),
+    );
 
     // Kill ONLY the target composition's timeline(s) — leaving every other
     // composition's timeline (and its children on the global timeline) intact.
@@ -440,6 +434,7 @@ export function applySoftReload(
         }
       }
     }
+    forgetLiveSets(targets);
 
     for (const script of staleScripts) script.remove();
 
 
@@ -19,7 +19,7 @@ import {
   diffSoftReloadableRestore,
   showRestoreInPlace,
 } from "./gsapUndoRestore";
-import { noteScriptWritten } from "./gsapSoftReload";
+import { recordLiveSet } from "./softReloadTargets";
 import { applyPatch } from "./sourcePatcher";
 import { beginStudioManualEditGesture } from "../components/editor/manualEdits";
 import { writePlainMove, writeTranslatePx } from "../components/editor/plainTranslate";
@@ -215,11 +215,16 @@ 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, patchedLive = false) => {
+    const undoScriptEdit = (
+      live: string,
+      authored: string,
+      edit: string,
+      patchedLive?: (doc: Document) => void,
+    ) => {
       const { iframe, contentWindow, doc } = buildLiveIframe(
         `${root(live)}<script>${script(patchedLive ? "" : edit)}</script>`,
       );
-      if (patchedLive) noteScriptWritten(iframe, script(edit));
+      patchedLive?.(doc);
       const clearProps = (targets: HTMLElement[]) =>
         targets.forEach((t) => t.removeAttribute("style"));
       Object.assign(contentWindow.gsap, { set: clearProps });
@@ -250,7 +255,7 @@ describe("applyUndoRestoreToPreview", () => {
         `<div id="a" style="left: 10px; width: 300px">t</div>`,
         `<div id="a" style="left: 10px">t</div>`,
         `gsap.set("#a",{width:300});`,
-        true,
+        (live) => recordLiveSet(live.getElementById("a")!, { width: 300 }),
       );
       const { style } = doc.getElementById("a")!;
       expect([style.width, style.left]).toEqual(["", "10px"]);
 
@@ -63,6 +63,7 @@ export function collectResetTargets(
     } catch {}
   }
   sweepHeldElements(doc, targetKeys, others, targets);
+  addLiveSetTargets(doc, targetKeys, targets);
   for (const script of outgoingScripts) addStandaloneSetTargets(doc, script, targets);
   return targets;
 }
@@ -108,6 +109,35 @@ function sweepHeldElements(
   }
 }
 
+// What a live patch set on each element since its last reload; no script in the preview ran it.
+const liveSets = new WeakMap<Document, Map<Element, Set<string>>>();
+
+export function recordLiveSet(el: Element, vars: Record<string, unknown>): void {
+  const byElement = liveSets.get(el.ownerDocument) ?? new Map<Element, Set<string>>();
+  liveSets.set(el.ownerDocument, byElement);
+  const props = byElement.get(el) ?? new Set<string>();
+  for (const prop of tweenedProps(vars)) props.add(prop);
+  byElement.set(el, props);
+}
+
+function addLiveSetTargets(
+  doc: Document,
+  targetKeys: string[],
+  targets: Map<Element, Set<string>>,
+): void {
+  const roots = new Set<Element | null | undefined>(targetKeys.map((k) => compositionRoot(doc, k)));
+  for (const [el, props] of liveSets.get(doc) ?? []) {
+    if (!roots.has(el) && !roots.has(el.parentElement?.closest("[data-composition-id]"))) continue;
+    const seen = targets.get(el) ?? new Set<string>();
+    for (const prop of props) seen.add(prop);
+    targets.set(el, seen);
+  }
+}
+
+export function forgetLiveSets(reset: Map<Element, unknown>): void {
+  for (const el of reset.keys()) liveSets.get(el.ownerDocument)?.delete(el);
+}
+
 /** Adds what each standalone `gsap.set` in the outgoing script wrote, which no timeline child records. */
 function addStandaloneSetTargets(
   doc: Document,