fix(editors): preserve media during external reloads

A take or rendered clip could complete after an external reload began and before its response applied, losing the new media. Re-check document dirtiness after the fetch and merge when it changed.

Author: georgi

web/src/hooks/script/useScriptServerSync.ts

@@ -584,7 +584,23 @@ export const useScriptServerSync = (
       isDirty: () =>
         (store.getState().scripts[scriptId] ?? null) !== syncedRef.current,
       reload: () => {
-        void load("reloaded");
+        void (async () => {
+          try {
+            const response = await trpcClient.scripts.get.query({ id: scriptId });
+            if (disposed) return;
+            // A take may complete while the clean-editor reload is in flight.
+            // Merge that new draft with the external response instead of
+            // applying the response over the take.
+            if (isDirty()) {
+              await mergeExternal({ updatedAt: response.updatedAt }, response);
+              return;
+            }
+            applyResponse(response, "reloaded");
+          } catch (error) {
+            console.error("Failed to reload script", error);
+            store.getState().setSaveStatus(scriptId, "error");
+          }
+        })();
       },
       merge: (notice) => {
         // A save in flight makes the notice ambiguous: it may be that save's

web/src/hooks/timeline/useTimelineExternalSync.ts

@@ -14,7 +14,10 @@
  */
 import { useEffect } from "react";
 
-import { registerDocumentSync } from "../../stores/documentSync";
+import {
+  handleDocumentResourceChange,
+  registerDocumentSync
+} from "../../stores/documentSync";
 import {
   isOlderUpdatedAt,
   timelineTemporalOf,
@@ -185,11 +188,21 @@ export function useTimelineExternalSync(sequenceId: string | null): void {
       isDirty: () => isTimelineDocumentDirty(sequenceId),
       reload: () => {
         void (async () => {
-          adopt(
-            await trpcClient.timeline.get.query({
-              id: sequenceId
-            })
-          );
+          const sequence = await trpcClient.timeline.get.query({
+            id: sequenceId
+          });
+          // A render may finish while this clean-editor reload is in flight.
+          // Re-route the already-observed external change so the dirty path
+          // merges it with the completed render rather than overwriting it.
+          if (isTimelineDocumentDirty(sequenceId)) {
+            handleDocumentResourceChange("timelinesequence", {
+              event: "updated",
+              id: sequenceId,
+              updatedAt: sequence.updatedAt
+            });
+            return;
+          }
+          adopt(sequence);
         })();
       },
       merge: (notice) => {