@bian-womp/spark-workbench 0.2.71 → 0.2.73

package/lib/cjs/index.cjs

@@ -381,6 +381,7 @@ class InMemoryWorkbench extends AbstractWorkbench {
     }
     setHistory(history) {
         this.historyState = history;
+        this.emit("historyChanged", { history });
     }
     getNodeRuntimeMetadata(nodeId) {
         return this.runtimeState?.nodes[nodeId];
@@ -2714,8 +2715,8 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
     }, [wb, registry, overrides?.getDefaultNodeSize]);
     const updateEdgeType = React.useCallback((edgeId, typeId) => wb.updateEdgeType(edgeId, typeId), [wb]);
     const triggerExternal = React.useCallback((nodeId, event) => runner.triggerExternal(nodeId, event), [runner]);
-    // Helper to save runtime metadata to extData.runtime and workbench state
-    const saveRuntimeMetadata = React.useCallback(async () => {
+    // Helper to save runtime metadata and UI state to extData
+    const saveUiRuntimeMetadata = React.useCallback(async () => {
         try {
             const current = wb.getRuntimeState() ?? { nodes: {} };
             const metadata = { nodes: { ...current.nodes } };
@@ -2728,8 +2729,13 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
             }
             // Save cleaned metadata to workbench state
             wb.setRuntimeState(metadata);
-            // Save to extData.runtime via runner (no snapshotFull)
-            await runner.setExtData?.({ runtime: metadata });
+            // Get UI state
+            const uiState = wb.getUIState();
+            // Save both runtime and UI state to extData (merge to preserve both)
+            await runner.setExtData?.({
+                ...(uiState ? { ui: uiState } : {}),
+                runtime: metadata,
+            });
         }
         catch (err) {
             console.warn("[WorkbenchContext] Failed to save runtime metadata:", err);
@@ -3093,7 +3099,7 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
             }
             if (!runner.isRunning()) {
                 if (event.commit) {
-                    await saveRuntimeMetadata();
+                    await saveUiRuntimeMetadata();
                     const history = await runner.commit(reason).catch((err) => {
                         console.error("[WorkbenchContext] Error committing:", err);
                         return undefined;
@@ -3127,7 +3133,7 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
                     await runner.update(event.def, { dry: event.dry });
                 }
                 if (event.commit) {
-                    await saveRuntimeMetadata();
+                    await saveUiRuntimeMetadata();
                     const history = await runner
                         .commit(event.reason ?? reason)
                         .catch((err) => {
@@ -3148,7 +3154,7 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
             setSelectedNodeId(sel.nodes?.[0]);
             setSelectedEdgeId(sel.edges?.[0]);
             if (sel.commit) {
-                await saveRuntimeMetadata();
+                await saveUiRuntimeMetadata();
                 const history = await runner
                     .commit(sel.reason ?? "selection")
                     .catch((err) => {
@@ -3180,7 +3186,7 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
                         reason = "viewport";
                     }
                 }
-                await saveRuntimeMetadata();
+                await saveUiRuntimeMetadata();
                 const history = await runner
                     .commit(event.reason ?? reason)
                     .catch((err) => {
@@ -4383,6 +4389,7 @@ const WorkbenchCanvas = React.forwardRef(({ showValues, toString, toElement, get
     const nodeValidation = validationByNode;
     const edgeValidation = validationByEdge.errors;
     const [registryVersion, setRegistryVersion] = React.useState(0);
+    const [historyState, setHistoryState] = React.useState(wb.getHistory());
     const prevNodesRef = React.useRef([]);
     const prevEdgesRef = React.useRef([]);
     function retainStabilityById(prev, next, isSame) {
@@ -4728,6 +4735,12 @@ const WorkbenchCanvas = React.forwardRef(({ showValues, toString, toElement, get
         });
         return () => off();
     }, [runner]);
+    React.useEffect(() => {
+        const off = wb.on("historyChanged", (event) => {
+            setHistoryState(event.history);
+        });
+        return () => off();
+    }, [wb]);
     const nodeIds = React.useMemo(() => Array.from(registry.nodes.keys()), [registry, registryVersion]);
     const defaultContextMenuHandlers = React.useMemo(() => {
         // Get storage from override or use workbench's internal storage
@@ -4743,12 +4756,12 @@ const WorkbenchCanvas = React.forwardRef(({ showValues, toString, toElement, get
                 return;
             wb.pasteCopiedData(data, position, { commit: true, reason: "paste" });
             onCloseMenu();
-        }, runner, () => storage.get(), () => storage.set(null), wb.getHistory());
+        }, runner, () => storage.get(), () => storage.set(null), historyState);
         if (overrides?.getDefaultContextMenuHandlers) {
             return overrides.getDefaultContextMenuHandlers(wb, baseHandlers);
         }
         return baseHandlers;
-    }, [addNodeAt, onCloseMenu, overrides, wb, runner]);
+    }, [addNodeAt, onCloseMenu, overrides, wb, runner, historyState]);
     const selectionContextMenuHandlers = React.useMemo(() => {
         // Get storage from override or use workbench's internal storage
         const storage = overrides?.getCopiedDataStorage