@lingjingai/script-editor 0.1.1 → 0.1.14

package/dist/index.js

@@ -1,6 +1,6 @@
-import { createContext, memo, useState, useMemo, useCallback, useRef, useContext, useEffect, useLayoutEffect, Fragment as Fragment$1, useDeferredValue } from 'react';
-import { Plus, Trash2, Check, Eraser, ArrowUp, ArrowDown, GripVertical, MessageCircle, Film, Brain, BookOpen, Scissors, ArrowUpToLine, Globe, BookText, ChevronRight, FileText, Users, MapPin, Package, Undo2, Redo2, MessageSquareQuote, ArrowLeft, ChevronLeft, Loader2, AlertCircle } from 'lucide-react';
-import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
+import { createContext, memo, useState, useMemo, useCallback, Fragment, useRef, useContext, useEffect, useLayoutEffect, useDeferredValue } from 'react';
+import { Plus, Trash2, X, Check, Eraser, ArrowUp, ArrowDown, GripVertical, MessageCircle, Film, Brain, BookOpen, Scissors, ArrowUpToLine, Globe, BookText, ChevronRight, FileText, Users, MapPin, Package, Undo2, Redo2, MessageSquareQuote, ArrowLeft, ChevronLeft, Loader2, AlertCircle } from 'lucide-react';
+import { jsxs, jsx, Fragment as Fragment$1 } from 'react/jsx-runtime';
 import { Virtuoso } from 'react-virtuoso';
 import { createPortal } from 'react-dom';
 
@@ -286,10 +286,10 @@ function getSceneContext(scene) {
     props: (scene.context?.props?.length ? scene.context.props : scene.props) ?? []
   };
 }
-function findState(states, stateId) {
+function findState(states2, stateId) {
   const id = stateId?.trim();
-  if (!id || !states) return void 0;
-  return states.find((state) => (state.state_id || "").trim() === id);
+  if (!id || !states2) return void 0;
+  return states2.find((state) => (state.state_id || "").trim() === id);
 }
 var ZH_DIGIT_MAP = {
   "\u96F6": 0,
@@ -443,7 +443,7 @@ function GroupHeader({
   highlighted,
   onToggle
 }) {
-  const inner = /* @__PURE__ */ jsxs(Fragment, { children: [
+  const inner = /* @__PURE__ */ jsxs(Fragment$1, { children: [
     onToggle ? /* @__PURE__ */ jsx(
       ChevronRight,
       {
@@ -591,7 +591,7 @@ function EntityGroup({
 }) {
   const [open, setOpen] = useState(true);
   const valid = items.filter((i) => i.id);
-  return /* @__PURE__ */ jsxs(Fragment, { children: [
+  return /* @__PURE__ */ jsxs(Fragment$1, { children: [
     /* @__PURE__ */ jsx(GroupHeader, { icon: Icon, label, count: valid.length, open, highlighted, onToggle: () => setOpen((v) => !v) }),
     open ? valid.length === 0 ? /* @__PURE__ */ jsx("div", { className: "lj-se-toc-empty", children: emptyText }) : valid.map((i) => /* @__PURE__ */ jsxs(
       "button",
@@ -931,7 +931,11 @@ function updateSceneItemActor(data, episodeIndex, sceneIndex, itemIndex, actorId
     const actions = [...scene.actions || []];
     const item = actions[itemIndex];
     if (!item) return scene;
-    actions[itemIndex] = { ...item, actor_id: actorId.trim() };
+    const next = { ...item, actor_id: actorId.trim() };
+    delete next.speaker_id;
+    delete next.speakers;
+    delete next.lines;
+    actions[itemIndex] = next;
     return { ...scene, actions };
   });
 }
@@ -1267,6 +1271,21 @@ function buildDistributionIndex(data, prev) {
   }
   return index;
 }
+var states = /* @__PURE__ */ new Map();
+function readScrollState(scope) {
+  return scope ? states.get(scope) : void 0;
+}
+function useScrollStateMemo(scope, virtuosoRef) {
+  useEffect(() => {
+    if (!scope) return;
+    const ref = virtuosoRef;
+    return () => {
+      ref.current?.getState((snapshot) => {
+        states.set(scope, snapshot);
+      });
+    };
+  }, [scope, virtuosoRef]);
+}
 function Popover({
   trigger,
   children,
@@ -1383,7 +1402,7 @@ function RowMenuPanel({
   sections
 }) {
   return /* @__PURE__ */ jsxs("div", { className: "lj-se-rowmenu-inner", children: [
-    typeSeg ? /* @__PURE__ */ jsxs(Fragment, { children: [
+    typeSeg ? /* @__PURE__ */ jsxs(Fragment$1, { children: [
       /* @__PURE__ */ jsx("div", { className: "lj-se-rowmenu-cap", children: "\u6539\u4E3A" }),
       /* @__PURE__ */ jsx("div", { className: "lj-se-typeseg", children: TYPES.map((t) => {
         const Icon = t.icon;
@@ -1406,7 +1425,7 @@ function RowMenuPanel({
         );
       }) })
     ] }) : null,
-    sections.map((items, si) => /* @__PURE__ */ jsxs(Fragment$1, { children: [
+    sections.map((items, si) => /* @__PURE__ */ jsxs(Fragment, { children: [
       si > 0 || typeSeg ? /* @__PURE__ */ jsx("div", { className: "lj-se-rowmenu-div" }) : null,
       items.map((item) => {
         const Icon = item.icon;
@@ -1568,20 +1587,20 @@ function SelectField({
     }
   );
 }
-function stateOptions(states) {
-  return (states ?? []).map((s) => ({ value: (s.state_id ?? "").trim(), label: getStateDisplayName(s) })).filter((o) => o.value);
+function stateOptions(states2) {
+  return (states2 ?? []).map((s) => ({ value: (s.state_id ?? "").trim(), label: getStateDisplayName(s) })).filter((o) => o.value);
 }
 function AssetStateChip({
   name,
   orphan,
-  states,
+  states: states2,
   currentStateId,
   disabled,
   onChangeState,
   onDelete,
   onNavigate
 }) {
-  const opts = stateOptions(states);
+  const opts = stateOptions(states2);
   const trimmed = (currentStateId ?? "").trim();
   return /* @__PURE__ */ jsxs("span", { className: cn("lj-se-chip", orphan && "is-orphan"), title: orphan ? `${name} \u4E0D\u5B58\u5728` : void 0, children: [
     onNavigate ? /* @__PURE__ */ jsx("button", { type: "button", className: "lj-se-chip-name lj-se-chip-name--link", title: `\u8DF3\u5230 ${name}`, onClick: onNavigate, children: name }) : /* @__PURE__ */ jsx("span", { className: "lj-se-chip-name", children: name }),
@@ -1996,6 +2015,7 @@ function getActorCueVar(actorId, tone = "dialogue") {
   return `var(--lj-se-actor-cue-${idx})`;
 }
 var EditingSignalContext = createContext(null);
+var LIVE_COMMIT_MS = 400;
 function caretOffsetFromPoint(x, y) {
   const d = document;
   if (typeof d.caretRangeFromPoint === "function") {
@@ -2025,6 +2045,34 @@ function EditableText({
   const inputRef = useRef(null);
   const committedRef = useRef(value);
   const editingSignal = useContext(EditingSignalContext);
+  const liveTimerRef = useRef(null);
+  const composingRef = useRef(false);
+  const draftRef = useRef(value);
+  const onSaveRef = useRef(onSave);
+  onSaveRef.current = onSave;
+  const clearLiveTimer = () => {
+    if (liveTimerRef.current) {
+      clearTimeout(liveTimerRef.current);
+      liveTimerRef.current = null;
+    }
+  };
+  const flushLive = () => {
+    clearLiveTimer();
+    const next = draftRef.current;
+    if (next !== committedRef.current) {
+      committedRef.current = next;
+      onSaveRef.current(next);
+    }
+  };
+  const scheduleLive = () => {
+    clearLiveTimer();
+    liveTimerRef.current = setTimeout(() => {
+      liveTimerRef.current = null;
+      if (composingRef.current) return;
+      flushLive();
+    }, LIVE_COMMIT_MS);
+  };
+  useEffect(() => () => flushLive(), []);
   useEffect(() => {
     if (!editing || !editingSignal) return;
     editingSignal.inc();
@@ -2060,9 +2108,11 @@ function EditableText({
     if (sel && !sel.isCollapsed) return;
     caretRef.current = caretOffsetFromPoint(e.clientX, e.clientY);
     setDraft(committedRef.current);
+    draftRef.current = committedRef.current;
     setEditing(true);
   }
   function commit() {
+    clearLiveTimer();
     setEditing(false);
     onEditEnd?.();
     if (draft !== committedRef.current) {
@@ -2071,7 +2121,9 @@ function EditableText({
     }
   }
   function cancel() {
+    clearLiveTimer();
     setDraft(committedRef.current);
+    draftRef.current = committedRef.current;
     setEditing(false);
     onEditEnd?.();
   }
@@ -2091,8 +2143,20 @@ function EditableText({
     value: draft,
     className: "lj-se-editing" + (className ? " " + className : ""),
     onChange: (e) => {
-      setDraft(e.target.value);
+      const v = e.target.value;
+      setDraft(v);
+      draftRef.current = v;
       if (multiline) autoSize(e.target);
+      if (!composingRef.current) scheduleLive();
+    },
+    onCompositionStart: () => {
+      composingRef.current = true;
+      clearLiveTimer();
+    },
+    onCompositionEnd: (e) => {
+      composingRef.current = false;
+      draftRef.current = e.currentTarget.value;
+      scheduleLive();
     },
     onBlur: commit,
     onKeyDown: (e) => {
@@ -2118,10 +2182,10 @@ function formatStateChangeLabels(item, actorMap, locationMap, propMap) {
     const kind = change.target_kind?.trim() || "actor";
     const id = change.target_id?.trim() || "";
     if (!id) return "";
-    const states = kind === "location" ? locationMap.get(id)?.states : kind === "prop" ? propMap.get(id)?.states : actorMap.get(id)?.states;
+    const states2 = kind === "location" ? locationMap.get(id)?.states : kind === "prop" ? propMap.get(id)?.states : actorMap.get(id)?.states;
     const name = kind === "location" ? getLocationDisplayName(locationMap.get(id)) || id : kind === "prop" ? getPropDisplayName(propMap.get(id)) || id : getActorDisplayName(actorMap.get(id)) || id;
-    const from = getStateDisplayName(findState(states, change.from_state_id)) || change.from_state_id?.trim() || "\u672A\u8BBE";
-    const to = getStateDisplayName(findState(states, change.to_state_id)) || change.to_state_id?.trim() || "\u672A\u8BBE";
+    const from = getStateDisplayName(findState(states2, change.from_state_id)) || change.from_state_id?.trim() || "\u672A\u8BBE";
+    const to = getStateDisplayName(findState(states2, change.to_state_id)) || change.to_state_id?.trim() || "\u672A\u8BBE";
     return `${name}\uFF1A${from} \u2192 ${to}`;
   }).filter(Boolean);
   if (item.transition_prompt?.process || item.transition_prompt?.contrast) {
@@ -2158,12 +2222,19 @@ function SceneItemRowImpl({
   const type = item.type ?? "dialogue" /* Dialogue */;
   const content = item.content ?? "";
   const actorId = item.actor_id?.trim() || "";
-  const actor = actorMap.get(actorId);
-  const actorName = actor ? getActorDisplayName(actor) : actorId || "\u672A\u77E5\u89D2\u8272";
-  const hasOrphanActor = !!actorId && !actor;
   const emotion = translateEmotionLabel(item.emotion);
   const stateLabels = formatStateChangeLabels(item, actorMap, locationMap, propMap);
-  const structured = type === "dialogue" /* Dialogue */ && (!!item.speaker_id || !!item.delivery || (item.speakers?.length ?? 0) > 0 || (item.lines?.length ?? 0) > 0);
+  const multiSpeaker = type === "dialogue" /* Dialogue */ && (item.delivery === "overlap" || (item.lines?.length ?? 0) > 0 || (item.speakers?.length ?? 0) > 1);
+  const resolvedActorId = actorId || (() => {
+    const spkId = item.speaker_id?.trim() || item.speakers?.[0]?.speaker_id?.trim() || "";
+    if (!spkId) return "";
+    const spk = speakerMap.get(spkId);
+    const kind = spk?.source_kind?.trim();
+    if ((kind === "actor" || kind === "prop") && spk?.source_id?.trim()) return spk.source_id.trim();
+    if (spkId.startsWith("spk_") && actorMap.has(spkId.slice(4))) return spkId.slice(4);
+    return "";
+  })();
+  const resolvedActor = actorMap.get(resolvedActorId) ?? propMap.get(resolvedActorId);
   const handle = /* @__PURE__ */ jsx(
     RowControlHandle,
     {
@@ -2178,11 +2249,11 @@ function SceneItemRowImpl({
       onDelete
     }
   );
-  const actorCue = (tone) => structured ? /* @__PURE__ */ jsxs(
+  const actorCue = (tone) => multiSpeaker ? /* @__PURE__ */ jsxs(
     "span",
     {
       className: "lj-se-cue lj-se-cue--structured",
-      style: !hasOrphanActor ? { color: getActorCueVar(actorId, tone) } : void 0,
+      style: resolvedActor ? { color: getActorCueVar(resolvedActorId, tone) } : void 0,
       children: [
         getDialogueSpeakerLabel(item, actorMap, speakerMap) || "\u672A\u77E5\u53D1\u58F0\u6E90",
         getDialogueDeliveryLabel(item.delivery) ? /* @__PURE__ */ jsxs("span", { className: "lj-se-cue-delivery", children: [
@@ -2195,13 +2266,13 @@ function SceneItemRowImpl({
   ) : /* @__PURE__ */ jsx(
     SelectField,
     {
-      value: actorId,
+      value: resolvedActorId,
       options: actorOptions,
       disabled,
       placeholder: "\u672A\u77E5\u89D2\u8272",
-      title: hasOrphanActor ? `\u89D2\u8272 ${actorName} \u4E0D\u5B58\u5728` : "\u5207\u6362\u89D2\u8272",
-      className: cn("lj-se-cue lj-se-cue--select", hasOrphanActor && "is-orphan"),
-      style: !hasOrphanActor ? { color: getActorCueVar(actorId, tone) } : void 0,
+      title: "\u5207\u6362\u89D2\u8272",
+      className: cn("lj-se-cue lj-se-cue--select", resolvedActorId && !resolvedActor && "is-orphan"),
+      style: resolvedActor ? { color: getActorCueVar(resolvedActorId, tone) } : void 0,
       onChange: onSaveActor
     }
   );
@@ -2210,7 +2281,7 @@ function SceneItemRowImpl({
     if (type === "dialogue" /* Dialogue */) {
       body2 = /* @__PURE__ */ jsxs("div", { className: "lj-se-std-dialogue", children: [
         actorCue("dialogue"),
-        !structured ? /* @__PURE__ */ jsx("div", { className: "lj-se-std-emotion", children: /* @__PURE__ */ jsx(EditableText, { value: item.emotion ?? "", disabled, placeholder: "\u60C5\u7EEA\u2026", onSave: onSaveEmotion }) }) : emotion ? /* @__PURE__ */ jsx("div", { className: "lj-se-std-emotion", children: emotion }) : null,
+        /* @__PURE__ */ jsx("div", { className: "lj-se-std-emotion", children: /* @__PURE__ */ jsx(EditableText, { value: item.emotion ?? "", disabled, placeholder: "\u60C5\u7EEA\u2026", onSave: onSaveEmotion }) }),
         /* @__PURE__ */ jsx(
           EditableText,
           {
@@ -2276,19 +2347,19 @@ function SceneItemRowImpl({
     const tone = isInner ? "inner" : "dialogue";
     const tag = isInner ? emotion ? `OS\xB7${emotion}` : "OS" : emotion;
     body = /* @__PURE__ */ jsxs("p", { className: cn("lj-se-asian-cueline", isInner && "is-inner"), children: [
-      structured ? /* @__PURE__ */ jsx("strong", { className: "lj-se-asian-speaker", style: !hasOrphanActor ? { color: getActorCueVar(actorId, tone) } : void 0, children: getDialogueSpeakerLabel(item, actorMap, speakerMap) }) : /* @__PURE__ */ jsx(
+      multiSpeaker ? /* @__PURE__ */ jsx("strong", { className: "lj-se-asian-speaker", style: resolvedActor ? { color: getActorCueVar(resolvedActorId, tone) } : void 0, children: getDialogueSpeakerLabel(item, actorMap, speakerMap) }) : /* @__PURE__ */ jsx(
         SelectField,
         {
-          value: actorId,
+          value: resolvedActorId,
           options: actorOptions,
           disabled,
           placeholder: "\u672A\u77E5\u89D2\u8272",
-          className: cn("lj-se-asian-speaker lj-se-asian-speaker--select", hasOrphanActor && "is-orphan"),
-          style: !hasOrphanActor ? { color: getActorCueVar(actorId, tone) } : void 0,
+          className: cn("lj-se-asian-speaker lj-se-asian-speaker--select", resolvedActorId && !resolvedActor && "is-orphan"),
+          style: resolvedActor ? { color: getActorCueVar(resolvedActorId, tone) } : void 0,
           onChange: onSaveActor
         }
       ),
-      !structured ? /* @__PURE__ */ jsxs("span", { className: "lj-se-asian-tag", children: [
+      !multiSpeaker ? /* @__PURE__ */ jsxs("span", { className: "lj-se-asian-tag", children: [
         "\uFF08",
         /* @__PURE__ */ jsx(EditableText, { value: item.emotion ?? "", disabled, placeholder: isInner ? "OS" : "\u60C5\u7EEA", onSave: onSaveEmotion }),
         "\uFF09"
@@ -2308,6 +2379,12 @@ function SceneItemRowImpl({
   ] });
 }
 var SceneItemRow = memo(SceneItemRowImpl);
+function DiffActionControls({ onAccept, onReject }) {
+  return /* @__PURE__ */ jsxs("span", { className: "lj-se-actiondiff-ctrl", children: [
+    /* @__PURE__ */ jsx("button", { type: "button", className: "lj-se-actiondiff-reject", title: "\u62D2\u7EDD\u8FD9\u884C", onClick: onReject, children: /* @__PURE__ */ jsx(X, { className: "lj-se-ic-3", strokeWidth: 2.75 }) }),
+    /* @__PURE__ */ jsx("button", { type: "button", className: "lj-se-actiondiff-accept", title: "\u63A5\u53D7\u8FD9\u884C", onClick: onAccept, children: /* @__PURE__ */ jsx(Check, { className: "lj-se-ic-3", strokeWidth: 2.75 }) })
+  ] });
+}
 function SceneEditorImpl({
   episodeIndex,
   sceneIndex,
@@ -2316,6 +2393,7 @@ function SceneEditorImpl({
   format,
   disabled,
   focused = false,
+  actionDiff,
   onEdit,
   onNavigateAsset,
   onRequestAssetDelete
@@ -2323,10 +2401,18 @@ function SceneEditorImpl({
   const [pendingEdit, setPendingEdit] = useState(null);
   const { actorMap, speakerMap, locationMap, propMap } = maps;
   const actions = scene.actions ?? [];
-  const actorOptions = useMemo(
-    () => Array.from(actorMap.values()).map((a) => ({ value: (a.actor_id ?? "").trim(), label: getActorDisplayName(a) })).filter((o) => o.value),
-    [actorMap]
-  );
+  const actorOptions = useMemo(() => {
+    const out = [];
+    for (const a of actorMap.values()) {
+      const v = (a.actor_id ?? "").trim();
+      if (v) out.push({ value: v, label: getActorDisplayName(a) });
+    }
+    for (const p of propMap.values()) {
+      const v = (p.prop_id ?? "").trim();
+      if (v) out.push({ value: v, label: `${getPropDisplayName(p)}\uFF08\u9053\u5177\uFF09` });
+    }
+    return out;
+  }, [actorMap, propMap]);
   const insertAt = useCallback(
     (index, type) => {
       const inherited = pickInheritedActorId(scene, index);
@@ -2362,6 +2448,32 @@ function SceneEditorImpl({
     e.preventDefault();
     dnd?.drop();
   };
+  const noop = () => {
+  };
+  const renderOldRow = (item) => /* @__PURE__ */ jsx(
+    SceneItemRow,
+    {
+      item,
+      actorMap,
+      speakerMap,
+      locationMap,
+      propMap,
+      actorOptions,
+      format,
+      disabled: true,
+      onSave: noop,
+      onSaveActor: noop,
+      onSaveEmotion: noop,
+      onChangeType: noop,
+      onInsertAbove: noop,
+      onInsertBelow: noop,
+      onDelete: noop
+    }
+  );
+  const renderGhosts = (beforeIdx) => actionDiff?.removedBefore.get(beforeIdx)?.map((m, gi) => /* @__PURE__ */ jsxs("div", { className: "lj-se-action-slot lj-se-diff-old lj-se-ghost-row", children: [
+    /* @__PURE__ */ jsx(DiffActionControls, { onAccept: () => actionDiff.onAccept(m), onReject: () => actionDiff.onReject(m) }),
+    m.item ? renderOldRow(m.item) : /* @__PURE__ */ jsx("p", { className: "lj-se-ghost-empty", children: "\uFF08\u5DF2\u5220\u9664\u7A7A\u884C\uFF09" })
+  ] }, `ghost-${beforeIdx}-${gi}`)) ?? null;
   return /* @__PURE__ */ jsxs("div", { className: "lj-se-scene", children: [
     /* @__PURE__ */ jsx(
       SceneHeader,
@@ -2381,52 +2493,73 @@ function SceneEditorImpl({
       }
     ),
     /* @__PURE__ */ jsxs("div", { className: "lj-se-actions", children: [
-      actions.map((item, idx) => /* @__PURE__ */ jsx(
-        "div",
-        {
-          className: cn("lj-se-action-slot", dragIndex === idx && "is-dragging", dropSlot === idx && "drop-before"),
-          onDragOver: (e) => onSlotDragOver(e, idx),
-          onDrop: onSlotDrop,
-          children: /* @__PURE__ */ jsx(
-            SceneItemRow,
+      actions.map((item, idx) => {
+        const mark = actionDiff?.byIndex.get(idx);
+        return /* @__PURE__ */ jsxs(Fragment, { children: [
+          renderGhosts(idx),
+          /* @__PURE__ */ jsxs(
+            "div",
             {
-              item,
-              actorMap,
-              speakerMap,
-              locationMap,
-              propMap,
-              actorOptions,
-              format,
-              disabled,
-              autoEdit: pendingEdit === idx,
-              onEditEnd: pendingEdit === idx ? clearPending : void 0,
-              canSplit: idx > 0,
-              dragHandleProps: disabled ? void 0 : { draggable: true, onDragStart: (e) => onDragStart(e, idx), onDragEnd: () => dnd?.end() },
-              onSave: (content) => {
-                clearPending();
-                onEdit((cur) => updateSceneItemContent(cur, episodeIndex, sceneIndex, idx, content));
-              },
-              onSaveActor: (actorId) => onEdit((cur) => updateSceneItemActor(cur, episodeIndex, sceneIndex, idx, actorId)),
-              onSaveEmotion: (emotion) => onEdit((cur) => updateSceneItemEmotion(cur, episodeIndex, sceneIndex, idx, emotion)),
-              onChangeType: (type) => {
-                clearPending();
-                onEdit((cur) => updateSceneItemType(cur, episodeIndex, sceneIndex, idx, type));
-              },
-              onInsertAbove: () => insertSame(idx, idx),
-              onInsertBelow: () => insertSame(idx + 1, idx),
-              onSplitHere: idx > 0 ? () => {
-                clearPending();
-                onEdit((cur) => splitScene(cur, episodeIndex, sceneIndex, idx));
-              } : void 0,
-              onDelete: () => {
-                clearPending();
-                onEdit((cur) => deleteSceneItem(cur, episodeIndex, sceneIndex, idx));
-              }
+              className: cn(
+                "lj-se-action-slot",
+                dragIndex === idx && "is-dragging",
+                dropSlot === idx && "drop-before",
+                mark && (mark.kind === "added" ? "is-diff-added" : "is-diff-modified")
+              ),
+              onDragOver: (e) => onSlotDragOver(e, idx),
+              onDrop: onSlotDrop,
+              children: [
+                mark ? /* @__PURE__ */ jsx(
+                  DiffActionControls,
+                  {
+                    onAccept: () => actionDiff.onAccept(mark),
+                    onReject: () => actionDiff.onReject(mark)
+                  }
+                ) : null,
+                mark?.kind === "modified" && mark.item ? /* @__PURE__ */ jsx("div", { className: "lj-se-diff-old", children: renderOldRow(mark.item) }) : null,
+                /* @__PURE__ */ jsx(
+                  SceneItemRow,
+                  {
+                    item,
+                    actorMap,
+                    speakerMap,
+                    locationMap,
+                    propMap,
+                    actorOptions,
+                    format,
+                    disabled,
+                    autoEdit: pendingEdit === idx,
+                    onEditEnd: pendingEdit === idx ? clearPending : void 0,
+                    canSplit: idx > 0,
+                    dragHandleProps: disabled ? void 0 : { draggable: true, onDragStart: (e) => onDragStart(e, idx), onDragEnd: () => dnd?.end() },
+                    onSave: (content) => {
+                      clearPending();
+                      onEdit((cur) => updateSceneItemContent(cur, episodeIndex, sceneIndex, idx, content));
+                    },
+                    onSaveActor: (actorId) => onEdit((cur) => updateSceneItemActor(cur, episodeIndex, sceneIndex, idx, actorId)),
+                    onSaveEmotion: (emotion) => onEdit((cur) => updateSceneItemEmotion(cur, episodeIndex, sceneIndex, idx, emotion)),
+                    onChangeType: (type) => {
+                      clearPending();
+                      onEdit((cur) => updateSceneItemType(cur, episodeIndex, sceneIndex, idx, type));
+                    },
+                    onInsertAbove: () => insertSame(idx, idx),
+                    onInsertBelow: () => insertSame(idx + 1, idx),
+                    onSplitHere: idx > 0 ? () => {
+                      clearPending();
+                      onEdit((cur) => splitScene(cur, episodeIndex, sceneIndex, idx));
+                    } : void 0,
+                    onDelete: () => {
+                      clearPending();
+                      onEdit((cur) => deleteSceneItem(cur, episodeIndex, sceneIndex, idx));
+                    }
+                  }
+                )
+              ]
             }
           )
-        },
-        `item-${idx}`
-      )),
+        ] }, `item-${idx}`);
+      }),
+      renderGhosts(actions.length),
       dropSlot === actions.length && actions.length > 0 ? /* @__PURE__ */ jsx("div", { className: "lj-se-dropline-end" }) : null,
       actions.length === 0 && !disabled ? /* @__PURE__ */ jsxs(
         "button",
@@ -2804,7 +2937,7 @@ function AssetCardImpl({
   const name = group === "actors" ? getActorDisplayName(entity) : group === "locations" ? getLocationDisplayName(entity) : getPropDisplayName(entity);
   const rawDescription = entity.description ?? "";
   const description = rawDescription.trim();
-  const states = entity.states ?? [];
+  const states2 = entity.states ?? [];
   const fromRef = buildSelectionFrom(kind, assetId);
   return /* @__PURE__ */ jsx("div", { className: "lj-se-assetcard-row", children: /* @__PURE__ */ jsxs("article", { className: "lj-se-assetcard", "data-no-quote-selection": true, children: [
     /* @__PURE__ */ jsxs("div", { className: "lj-se-assetcard-head", children: [
@@ -2852,7 +2985,7 @@ function AssetCardImpl({
       /* @__PURE__ */ jsxs("div", { className: "lj-se-assetcard-states-head", children: [
         /* @__PURE__ */ jsxs("span", { className: "lj-se-assetcard-states-label", children: [
           "\u72B6\u6001 ",
-          /* @__PURE__ */ jsx("span", { className: "lj-se-field-hint", children: states.length })
+          /* @__PURE__ */ jsx("span", { className: "lj-se-field-hint", children: states2.length })
         ] }),
         !disabled ? /* @__PURE__ */ jsxs(
           "button",
@@ -2867,7 +3000,7 @@ function AssetCardImpl({
           }
         ) : null
       ] }),
-      states.length > 0 ? /* @__PURE__ */ jsx("div", { className: "lj-se-assetcard-state-cards", children: states.map((state, idx) => {
+      states2.length > 0 ? /* @__PURE__ */ jsx("div", { className: "lj-se-assetcard-state-cards", children: states2.map((state, idx) => {
         const sid = (state.state_id ?? "").trim() || `idx-${idx}`;
         return /* @__PURE__ */ jsxs("div", { className: "lj-se-assetcard-state", children: [
           /* @__PURE__ */ jsxs("div", { className: "lj-se-assetcard-state-top", children: [
@@ -2922,6 +3055,10 @@ function ScriptStream({
   selection,
   changedSceneKeys,
   sceneDiff,
+  actionDiffByScene,
+  onAcceptAction,
+  onRejectAction,
+  scrollScopeKey,
   onEdit,
   onSelectionChange,
   onRequestAssetDelete
@@ -2944,6 +3081,7 @@ function ScriptStream({
     return next;
   }, [deferredValue]);
   const handleRef = useRef(null);
+  useScrollStateMemo(scrollScopeKey, handleRef);
   const programmaticUntil = useRef(0);
   const lastEmitted = useRef(-1);
   const lastScrolledKey = useRef("");
@@ -3003,8 +3141,8 @@ function ScriptStream({
     const idx = selectionToFlatIndex(stream, selection);
     if (idx == null) return;
     lastScrolledKey.current = key;
-    programmaticUntil.current = Date.now() + 700;
-    handleRef.current?.scrollToIndex({ index: idx, align: "start", behavior: "smooth" });
+    programmaticUntil.current = Date.now() + 200;
+    handleRef.current?.scrollToIndex({ index: idx, align: "start", behavior: "auto" });
   }, [selection, stream]);
   const emitScrollSelection = (topIndex) => {
     if (Date.now() < programmaticUntil.current) return;
@@ -3021,6 +3159,7 @@ function ScriptStream({
       ref: handleRef,
       className: "lj-se-stream lj-se-scroll",
       data: stream.items,
+      restoreStateFrom: readScrollState(scrollScopeKey),
       increaseViewportBy: 1500,
       rangeChanged: (range) => emitScrollSelection(range.startIndex),
       itemContent: (_index, item) => {
@@ -3064,19 +3203,26 @@ function ScriptStream({
             if (!scene) return null;
             const focused = selection.kind === "scene" && selection.episodeIdx === item.episodeIdx && selection.sceneIdx === item.sceneIdx;
             const diffKey = `${item.episodeIdx}:${item.sceneId}`;
-            const changed = changedSceneKeys?.has(diffKey) ?? false;
-            const diffKind = !disabled ? sceneDiff?.kindByKey.get(diffKey) : void 0;
-            return /* @__PURE__ */ jsx("div", { className: "lj-se-stream-row", "data-quote-source": true, children: /* @__PURE__ */ jsxs("div", { className: cn("lj-se-paper-seg", paperEdge(item.key), changed && "is-changed"), children: [
-              diffKind ? /* @__PURE__ */ jsxs("div", { className: "lj-se-scenediff", children: [
-                /* @__PURE__ */ jsx("span", { className: cn("lj-se-scenediff-tag", diffKind === "added" && "is-added"), children: diffKind === "added" ? "AI \u65B0\u589E" : "AI \u6539\u52A8" }),
+            const inDiff = !disabled && (changedSceneKeys?.has(diffKey) ?? false);
+            const wholeKind = !disabled ? sceneDiff?.kindByKey.get(diffKey) : void 0;
+            const sceneActions = !disabled ? actionDiffByScene?.get(diffKey) : void 0;
+            const actionDiff = sceneActions && onAcceptAction && onRejectAction ? {
+              byIndex: sceneActions.byIndex,
+              removedBefore: sceneActions.removedBefore,
+              onAccept: onAcceptAction,
+              onReject: onRejectAction
+            } : void 0;
+            return /* @__PURE__ */ jsx("div", { className: "lj-se-stream-row", "data-quote-source": true, children: /* @__PURE__ */ jsxs("div", { className: cn("lj-se-paper-seg", paperEdge(item.key), wholeKind && "is-changed"), children: [
+              sceneDiff && inDiff ? /* @__PURE__ */ jsxs("div", { className: "lj-se-scenediff", children: [
+                /* @__PURE__ */ jsx("span", { className: cn("lj-se-scenediff-tag", wholeKind === "added" && "is-added"), children: wholeKind === "added" ? "AI \u65B0\u589E" : "AI \u6539\u52A8" }),
                 /* @__PURE__ */ jsx("span", { className: "lj-se-scenediff-spacer" }),
                 /* @__PURE__ */ jsx(
                   "button",
                   {
                     type: "button",
                     className: "lj-se-scenediff-reject",
-                    onClick: () => sceneDiff.onReject(item.episodeIdx, item.sceneIdx, item.sceneId),
-                    children: "\u62D2\u7EDD"
+                    onClick: () => sceneDiff.onReject(item.episodeIdx, item.sceneId),
+                    children: "\u6574\u573A\u62D2\u7EDD"
                   }
                 ),
                 /* @__PURE__ */ jsx(
@@ -3085,13 +3231,14 @@ function ScriptStream({
                     type: "button",
                     className: "lj-se-scenediff-accept",
                     onClick: () => sceneDiff.onAccept(item.episodeIdx, item.sceneId),
-                    children: "\u63A5\u53D7"
+                    children: "\u6574\u573A\u63A5\u53D7"
                   }
                 )
               ] }) : null,
               /* @__PURE__ */ jsx(
                 SceneEditor,
                 {
+                  actionDiff,
                   episodeIndex: item.episodeIdx,
                   sceneIndex: item.sceneIdx,
                   scene,
@@ -3168,7 +3315,7 @@ function EpisodeBanner({
   onEdit
 }) {
   return /* @__PURE__ */ jsxs("div", { className: "lj-se-epbanner", children: [
-    projectTitle !== void 0 ? /* @__PURE__ */ jsxs(Fragment, { children: [
+    projectTitle !== void 0 ? /* @__PURE__ */ jsxs(Fragment$1, { children: [
       /* @__PURE__ */ jsx("div", { className: "lj-se-epbanner-kicker", children: "\u5267\u672C" }),
       /* @__PURE__ */ jsx("h1", { className: "lj-se-epbanner-script", children: /* @__PURE__ */ jsx(
         EditableText,
@@ -3267,6 +3414,21 @@ function computeChangeSet(baseline, current) {
   const count = (title ? 1 : 0) + (worldview ? 1 : 0) + (style ? 1 : 0) + changedScenes.size + removedCount;
   return { title, worldview, style, changedScenes, removedCount, count };
 }
+function changeSetToDiffScenes(changeSet) {
+  const out = [];
+  for (const [key, kind] of changeSet.changedScenes) {
+    const i = key.indexOf(":");
+    if (i < 0) continue;
+    const episodeIdx = Number(key.slice(0, i));
+    const sceneId = key.slice(i + 1);
+    if (Number.isFinite(episodeIdx)) out.push({ episodeIdx, sceneId, kind });
+  }
+  return out;
+}
+function buildDiffFromBaseline(baseline, current) {
+  const cs = computeChangeSet(baseline, current);
+  return { scenes: changeSetToDiffScenes(cs), removedCount: cs.removedCount, count: cs.count };
+}
 function acceptSceneIntoBaseline(baseline, episodeId, episodeIdx, scene) {
   const episodes = (baseline.episodes ?? []).slice();
   const id = episodeId?.trim();
@@ -3304,6 +3466,170 @@ function findBaselineScene(baseline, episodeId, episodeIdx, sceneId) {
   if (!sid) return null;
   return (ep.scenes ?? []).find((s) => (s.scene_id ?? "").trim() === sid) ?? null;
 }
+function actionSig(a) {
+  return [a.type ?? "", (a.content ?? "").trim(), a.actor_id ?? "", a.emotion ?? "", a.delivery ?? ""].join("\0");
+}
+function computeSceneActionDiff(baseline, current) {
+  const m = baseline.length;
+  const n = current.length;
+  const bs = baseline.map(actionSig);
+  const cs = current.map(actionSig);
+  const dp = Array.from({ length: m + 1 }, () => new Array(n + 1).fill(0));
+  for (let i2 = m - 1; i2 >= 0; i2--) {
+    for (let j2 = n - 1; j2 >= 0; j2--) {
+      dp[i2][j2] = bs[i2] === cs[j2] ? dp[i2 + 1][j2 + 1] + 1 : Math.max(dp[i2 + 1][j2], dp[i2][j2 + 1]);
+    }
+  }
+  const ops = [];
+  let i = 0;
+  let j = 0;
+  while (i < m && j < n) {
+    if (bs[i] === cs[j]) {
+      ops.push({ t: "match", j });
+      i++;
+      j++;
+    } else if (dp[i + 1][j] >= dp[i][j + 1]) {
+      ops.push({ t: "del", i });
+      i++;
+    } else {
+      ops.push({ t: "ins", j });
+      j++;
+    }
+  }
+  while (i < m) {
+    ops.push({ t: "del", i });
+    i++;
+  }
+  while (j < n) {
+    ops.push({ t: "ins", j });
+    j++;
+  }
+  const changed = [];
+  const removed = [];
+  let curJ = 0;
+  let p = 0;
+  while (p < ops.length) {
+    const op = ops[p];
+    if (op.t === "match") {
+      curJ = op.j + 1;
+      p++;
+      continue;
+    }
+    if (op.t === "ins") {
+      changed.push({ itemIdx: op.j, kind: "added" });
+      curJ = op.j + 1;
+      p++;
+      continue;
+    }
+    const dels = [];
+    while (p < ops.length && ops[p].t === "del") {
+      dels.push(ops[p].i);
+      p++;
+    }
+    const inss = [];
+    while (p < ops.length && ops[p].t === "ins") {
+      inss.push(ops[p].j);
+      p++;
+    }
+    const pair = Math.min(dels.length, inss.length);
+    for (let q = 0; q < pair; q++) changed.push({ itemIdx: inss[q], kind: "modified", baselineItemIdx: dels[q] });
+    for (let q = pair; q < inss.length; q++) changed.push({ itemIdx: inss[q], kind: "added" });
+    const ghostBefore = inss.length ? inss[inss.length - 1] + 1 : curJ;
+    for (let q = pair; q < dels.length; q++) removed.push({ beforeItemIdx: ghostBefore, baselineItemIdx: dels[q] });
+    if (inss.length) curJ = inss[inss.length - 1] + 1;
+  }
+  return { changed, removed };
+}
+function applyActionAccept(baselineScene, currentScene, mark) {
+  const bActions = (baselineScene.actions ?? []).slice();
+  const cActions = currentScene.actions ?? [];
+  if (mark.kind === "modified" && mark.baselineItemIdx != null) {
+    const item = cActions[mark.itemIdx];
+    if (item && mark.baselineItemIdx < bActions.length) bActions[mark.baselineItemIdx] = item;
+  } else if (mark.kind === "added") {
+    const item = cActions[mark.itemIdx];
+    if (item) bActions.splice(Math.min(mark.itemIdx, bActions.length), 0, item);
+  } else if (mark.kind === "removed" && mark.baselineItemIdx != null) {
+    if (mark.baselineItemIdx < bActions.length) bActions.splice(mark.baselineItemIdx, 1);
+  }
+  return { ...baselineScene, actions: bActions };
+}
+function applyActionReject(currentScene, baselineScene, mark) {
+  const cActions = (currentScene.actions ?? []).slice();
+  const bActions = baselineScene?.actions ?? [];
+  if (mark.kind === "modified" && mark.baselineItemIdx != null) {
+    const item = bActions[mark.baselineItemIdx];
+    if (item && mark.itemIdx < cActions.length) cActions[mark.itemIdx] = item;
+  } else if (mark.kind === "added") {
+    if (mark.itemIdx < cActions.length) cActions.splice(mark.itemIdx, 1);
+  } else if (mark.kind === "removed") {
+    const item = mark.item ?? (mark.baselineItemIdx != null ? bActions[mark.baselineItemIdx] : void 0);
+    if (item) cActions.splice(Math.min(mark.itemIdx, cActions.length), 0, item);
+  }
+  return { ...currentScene, actions: cActions };
+}
+function acceptActionIntoBaseline(baseline, current, mark) {
+  const cEp = current.episodes?.[mark.episodeIdx];
+  const curScene = cEp?.scenes?.find((s) => (s.scene_id ?? "").trim() === mark.sceneId.trim());
+  const baseScene = findBaselineScene(baseline, cEp?.episode_id, mark.episodeIdx, mark.sceneId);
+  if (!baseScene) {
+    return curScene ? acceptSceneIntoBaseline(baseline, cEp?.episode_id, mark.episodeIdx, curScene) : baseline;
+  }
+  const next = applyActionAccept(baseScene, curScene ?? baseScene, mark);
+  return acceptSceneIntoBaseline(baseline, cEp?.episode_id, mark.episodeIdx, next);
+}
+function rejectActionToBaseline(current, baseline, mark) {
+  const cEp = current.episodes?.[mark.episodeIdx];
+  const sceneIdx = cEp?.scenes?.findIndex((s) => (s.scene_id ?? "").trim() === mark.sceneId.trim()) ?? -1;
+  if (sceneIdx < 0 || !cEp?.scenes) return current;
+  const curScene = cEp.scenes[sceneIdx];
+  const baseScene = findBaselineScene(baseline, cEp.episode_id, mark.episodeIdx, mark.sceneId);
+  const next = applyActionReject(curScene, baseScene, mark);
+  return rejectSceneToBaseline(current, mark.episodeIdx, sceneIdx, next);
+}
+function buildActionDiff(baseline, current) {
+  const cs = computeChangeSet(baseline, current);
+  const scenes = [];
+  const actions = [];
+  for (const [key, kind] of cs.changedScenes) {
+    const ci = key.indexOf(":");
+    const episodeIdx = Number(key.slice(0, ci));
+    const sceneId = key.slice(ci + 1);
+    if (!Number.isFinite(episodeIdx)) continue;
+    if (kind === "added") {
+      scenes.push({ episodeIdx, sceneId, kind: "added" });
+      continue;
+    }
+    const ep = current.episodes?.[episodeIdx];
+    const curScene = ep?.scenes?.find((s) => (s.scene_id ?? "").trim() === sceneId);
+    const baseScene = findBaselineScene(baseline, ep?.episode_id, episodeIdx, sceneId);
+    if (!curScene) continue;
+    const sd = computeSceneActionDiff(baseScene?.actions ?? [], curScene.actions ?? []);
+    for (const c of sd.changed) {
+      actions.push({
+        episodeIdx,
+        sceneId,
+        kind: c.kind,
+        itemIdx: c.itemIdx,
+        baselineItemIdx: c.baselineItemIdx,
+        // modified carries the OLD baseline action so the editor can render the
+        // deleted line above the new one (unified-diff view)
+        item: c.kind === "modified" && c.baselineItemIdx != null ? baseScene?.actions?.[c.baselineItemIdx] : void 0
+      });
+    }
+    for (const r of sd.removed) {
+      actions.push({
+        episodeIdx,
+        sceneId,
+        kind: "removed",
+        itemIdx: r.beforeItemIdx,
+        baselineItemIdx: r.baselineItemIdx,
+        item: baseScene?.actions?.[r.baselineItemIdx]
+      });
+    }
+  }
+  return { scenes, actions, removedCount: cs.removedCount, count: scenes.length + actions.length + cs.removedCount };
+}
 
 // src/reference.ts
 function asNumber(value) {
@@ -3433,6 +3759,7 @@ function ScriptEditor({
   onRedo,
   onEditingChange,
   referenceFocusRequest,
+  scrollScopeKey,
   diff,
   asset,
   onAddChatReferences,
@@ -3453,6 +3780,31 @@ function ScriptEditor({
     }),
     []
   );
+  const undoKeysRef = useRef({ onUndo, onRedo, canUndo, canRedo });
+  undoKeysRef.current = { onUndo, onRedo, canUndo, canRedo };
+  useEffect(() => {
+    if (disabled) return;
+    const onKeyDown = (e) => {
+      if (!(e.metaKey || e.ctrlKey)) return;
+      const t = e.target;
+      if (t instanceof HTMLElement && (t.tagName === "INPUT" || t.tagName === "TEXTAREA" || t.tagName === "SELECT" || t.isContentEditable)) {
+        return;
+      }
+      const key = e.key.toLowerCase();
+      const { onUndo: u, onRedo: r, canUndo: cu, canRedo: cr } = undoKeysRef.current;
+      if (key === "z" && !e.shiftKey) {
+        if (!u || !cu) return;
+        e.preventDefault();
+        u();
+      } else if (key === "z" && e.shiftKey || key === "y") {
+        if (!r || !cr) return;
+        e.preventDefault();
+        r();
+      }
+    };
+    document.addEventListener("keydown", onKeyDown);
+    return () => document.removeEventListener("keydown", onKeyDown);
+  }, [disabled]);
   const [innerSelection, setInnerSelection] = useState(EMPTY_SELECTION);
   const selection = controlledSelection ?? innerSelection;
   const setSelection = useCallback(
@@ -3471,14 +3823,36 @@ function ScriptEditor({
     },
     [onFormatChange]
   );
-  const changeSet = useMemo(
-    () => computeChangeSet(diff?.baseline ?? null, value),
-    [diff?.baseline, value]
-  );
-  const changedSceneKeys = useMemo(
-    () => new Set(changeSet.changedScenes.keys()),
-    [changeSet]
-  );
+  const sceneKindByKey = useMemo(() => {
+    const m = /* @__PURE__ */ new Map();
+    for (const s of diff?.scenes ?? []) m.set(sceneChangeKey(s.episodeIdx, s.sceneId), s.kind);
+    return m;
+  }, [diff?.scenes]);
+  const actionDiffByScene = useMemo(() => {
+    const map = /* @__PURE__ */ new Map();
+    for (const m of diff?.actions ?? []) {
+      const key = sceneChangeKey(m.episodeIdx, m.sceneId);
+      let e = map.get(key);
+      if (!e) {
+        e = { byIndex: /* @__PURE__ */ new Map(), removedBefore: /* @__PURE__ */ new Map() };
+        map.set(key, e);
+      }
+      if (m.kind === "removed") {
+        const arr = e.removedBefore.get(m.itemIdx) ?? [];
+        arr.push(m);
+        e.removedBefore.set(m.itemIdx, arr);
+      } else {
+        e.byIndex.set(m.itemIdx, m);
+      }
+    }
+    return map;
+  }, [diff?.actions]);
+  const changedSceneKeys = useMemo(() => {
+    const s = new Set(sceneKindByKey.keys());
+    for (const k of actionDiffByScene.keys()) s.add(k);
+    return s;
+  }, [sceneKindByKey, actionDiffByScene]);
+  const diffCount = diff ? diff.count ?? diff.scenes.length + (diff.actions?.length ?? 0) + (diff.removedCount ?? 0) : 0;
   const changedSelections = useMemo(() => {
     if (changedSceneKeys.size === 0) return [];
     const out = [];
@@ -3503,28 +3877,15 @@ function ScriptEditor({
     },
     [changedSelections, diffCursor, setSelection]
   );
-  const onAcceptScene = useCallback(
-    (episodeIdx, sceneId) => {
-      if (!diff?.onPatchBaseline) return;
-      const ep = value.episodes?.[episodeIdx];
-      const scene = ep?.scenes?.find((s) => (s.scene_id ?? "").trim() === sceneId.trim());
-      if (!scene) return;
-      diff.onPatchBaseline((prev) => acceptSceneIntoBaseline(prev, ep?.episode_id, episodeIdx, scene));
-    },
-    [diff, value]
-  );
-  const onRejectScene = useCallback(
-    (episodeIdx, sceneIdx, sceneId) => {
-      const ep = value.episodes?.[episodeIdx];
-      const base = findBaselineScene(diff?.baseline ?? null, ep?.episode_id, episodeIdx, sceneId);
-      onEdit((cur) => rejectSceneToBaseline(cur, episodeIdx, sceneIdx, base));
-    },
-    [diff, value, onEdit]
-  );
-  const sceneDiff = useMemo(
-    () => diff?.onPatchBaseline && changeSet.changedScenes.size > 0 ? { kindByKey: changeSet.changedScenes, onAccept: onAcceptScene, onReject: onRejectScene } : void 0,
-    [diff?.onPatchBaseline, changeSet, onAcceptScene, onRejectScene]
-  );
+  const sceneDiff = useMemo(() => {
+    if (!diff || !diff.onAcceptScene && !diff.onRejectScene || changedSceneKeys.size === 0) return void 0;
+    const kindAt = (episodeIdx, sceneId) => sceneKindByKey.get(sceneChangeKey(episodeIdx, sceneId)) ?? "modified";
+    return {
+      kindByKey: sceneKindByKey,
+      onAccept: (episodeIdx, sceneId) => diff.onAcceptScene?.({ episodeIdx, sceneId, kind: kindAt(episodeIdx, sceneId) }),
+      onReject: (episodeIdx, sceneId) => diff.onRejectScene?.({ episodeIdx, sceneId, kind: kindAt(episodeIdx, sceneId) })
+    };
+  }, [diff, sceneKindByKey, changedSceneKeys]);
   useEffect(() => {
     if (!referenceFocusRequest) return;
     const sel = selectionFromScriptReference(referenceFocusRequest.reference);
@@ -3542,6 +3903,10 @@ function ScriptEditor({
       selection,
       changedSceneKeys,
       sceneDiff,
+      actionDiffByScene,
+      onAcceptAction: diff?.onAcceptAction,
+      onRejectAction: diff?.onRejectAction,
+      scrollScopeKey,
       onEdit,
       onSelectionChange: setSelection,
       onRequestAssetDelete
@@ -3577,7 +3942,7 @@ function ScriptEditor({
           SaveCapsule,
           {
             saveStatus,
-            diffCount: diff ? changeSet.count : 0,
+            diffCount,
             baselineStatus: diff?.baselineStatus,
             canApplyDiff: !!(diff?.onAcceptAll || diff?.onRejectAll),
             onDiffPrev: changedSelections.length > 0 ? () => navDiff(-1) : void 0,
@@ -3691,6 +4056,6 @@ __export(mutations_exports, {
   updateScenePropState: () => updateScenePropState
 });
 
-export { DeleteConfirmButton, EMPTY_SELECTION, EditableText, Popover, ScriptContentType, ScriptEditor, SelectField, buildSelectionFrom, computeChangeSet, fromToSelection, getActorCueVar, getActorMap, getEpisodeTitle, getLocationMap, getPropMap, getSceneContext, getSelectionEpisodeIdx, getSpeakerMap, isClipSelected, isEpisodeOpen, isSameSelectionTarget, isSceneSelected, mutations_exports as mutations, sceneChangeKey, selectionFromScriptReference, selectionTargetKey, withOrigin };
+export { DeleteConfirmButton, EMPTY_SELECTION, EditableText, Popover, ScriptContentType, ScriptEditor, SelectField, acceptActionIntoBaseline, acceptSceneIntoBaseline, applyActionAccept, applyActionReject, buildActionDiff, buildDiffFromBaseline, buildSelectionFrom, changeSetToDiffScenes, computeChangeSet, computeSceneActionDiff, findBaselineScene, fromToSelection, getActorCueVar, getActorMap, getEpisodeTitle, getLocationMap, getPropMap, getSceneContext, getSelectionEpisodeIdx, getSpeakerMap, isClipSelected, isEpisodeOpen, isSameSelectionTarget, isSceneSelected, mutations_exports as mutations, rejectActionToBaseline, rejectSceneToBaseline, sceneChangeKey, selectionFromScriptReference, selectionTargetKey, withOrigin };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map