@bian-womp/spark-workbench 0.2.35 → 0.2.36

package/lib/cjs/index.cjs

@@ -339,7 +339,6 @@ class AbstractGraphRunner {
         if (this.engine) {
             throw new Error("Engine already running. Stop the current engine first.");
         }
-        this.currentDef = def;
     }
     setInput(nodeId, handle, value) {
         if (!this.stagedInputs[nodeId])
@@ -396,7 +395,6 @@ class AbstractGraphRunner {
         this.engine = undefined;
         this.runtime?.dispose();
         this.runtime = undefined;
-        this.currentDef = undefined;
         if (this.runningKind) {
             this.runningKind = undefined;
             this.emit("status", { running: false, engine: undefined });
@@ -431,14 +429,12 @@ class LocalGraphRunner extends AbstractGraphRunner {
         this.emit("transport", { state: "local" });
     }
     build(def) {
-        this.currentDef = def;
         const builder = new sparkGraph.GraphBuilder(this.registry);
         this.runtime = builder.build(def);
         // Signal UI that freshly built graph should be considered invalidated
         this.emit("invalidate", { reason: "graph-built" });
     }
     update(def) {
-        this.currentDef = def;
         if (!this.runtime)
             return;
         // Prevent mid-run churn while wiring changes are applied
@@ -503,11 +499,11 @@ class LocalGraphRunner extends AbstractGraphRunner {
         if (eng instanceof sparkGraph.BatchedEngine)
             eng.flush();
     }
-    getOutputs() {
+    getOutputs(def) {
         const out = {};
-        if (!this.runtime || !this.currentDef)
+        if (!this.runtime)
             return out;
-        for (const n of this.currentDef.nodes) {
+        for (const n of def.nodes) {
             const desc = this.registry.nodes.get(n.typeId);
             const handles = Object.keys(desc?.outputs ?? {});
             for (const h of handles) {
@@ -521,17 +517,15 @@ class LocalGraphRunner extends AbstractGraphRunner {
         }
         return out;
     }
-    getInputs() {
+    getInputs(def) {
         const out = {};
-        if (!this.currentDef)
-            return out;
-        for (const n of this.currentDef.nodes) {
+        for (const n of def.nodes) {
             const staged = this.stagedInputs[n.nodeId] ?? {};
             const runtimeInputs = this.runtime
                 ? this.runtime.getNodeData?.(n.nodeId)?.inputs ?? {}
                 : {};
             // Build inbound handle set for this node from current def
-            const inbound = new Set(this.currentDef.edges
+            const inbound = new Set(def.edges
                 .filter((e) => e.target.nodeId === n.nodeId)
                 .map((e) => e.target.handle));
             // Merge staged only for non-inbound handles so UI reflects runtime values for wired inputs
@@ -545,11 +539,9 @@ class LocalGraphRunner extends AbstractGraphRunner {
         }
         return out;
     }
-    getInputDefaults() {
+    getInputDefaults(def) {
         const out = {};
-        if (!this.currentDef)
-            return out;
-        for (const n of this.currentDef.nodes) {
+        for (const n of def.nodes) {
             const dynDefaults = n.resolvedHandles?.inputDefaults ?? {};
             if (Object.keys(dynDefaults).length > 0) {
                 out[n.nodeId] = dynDefaults;
@@ -559,8 +551,24 @@ class LocalGraphRunner extends AbstractGraphRunner {
     }
     async snapshotFull() {
         const def = undefined; // UI will supply def/positions on download for local
-        const inputs = this.getInputs();
-        const outputs = this.getOutputs();
+        const inputs = this.getInputs(this.runtime
+            ? {
+                nodes: Array.from(this.runtime.getNodeIds()).map((id) => ({
+                    nodeId: id,
+                    typeId: "",
+                })),
+                edges: [],
+            }
+            : { nodes: [], edges: [] });
+        const outputs = this.getOutputs(this.runtime
+            ? {
+                nodes: Array.from(this.runtime.getNodeIds()).map((id) => ({
+                    nodeId: id,
+                    typeId: "",
+                })),
+                edges: [],
+            }
+            : { nodes: [], edges: [] });
         const environment = this.getEnvironment() || {};
         return { def, environment, inputs, outputs };
     }
@@ -637,8 +645,8 @@ class RemoteGraphRunner extends AbstractGraphRunner {
                             this.emit("registry", this.registry);
                             // Trigger update so validation/UI refreshes using last known graph
                             try {
-                                if (this.currentDef)
-                                    this.update(this.currentDef);
+                                if (this.lastDef)
+                                    this.update(this.lastDef);
                             }
                             catch {
                                 console.error("Failed to update graph definition after registry changed");
@@ -656,12 +664,12 @@ class RemoteGraphRunner extends AbstractGraphRunner {
         console.warn("Unsupported operation for remote runner");
     }
     update(def) {
-        this.currentDef = def;
         // Remote: forward update; ignore errors (fire-and-forget)
         this.ensureRemoteRunner().then(async (runner) => {
             try {
                 await runner.update(def);
                 this.emit("invalidate", { reason: "graph-updated" });
+                this.lastDef = def;
             }
             catch { }
         });
@@ -673,6 +681,7 @@ class RemoteGraphRunner extends AbstractGraphRunner {
             await runner.build(def);
             // Signal UI after remote build as well
             this.emit("invalidate", { reason: "graph-built" });
+            this.lastDef = def;
             // Hydrate current remote inputs/outputs (including defaults) into cache
             try {
                 const snap = await runner.snapshot();
@@ -808,12 +817,12 @@ class RemoteGraphRunner extends AbstractGraphRunner {
         // For now, we expose an async helper on RemoteRunner. Keep sync signature per interface.
         return undefined;
     }
-    getOutputs() {
+    getOutputs(def) {
         const out = {};
         const cache = this.valueCache;
-        if (!cache || !this.currentDef)
+        if (!cache)
             return out;
-        for (const n of this.currentDef.nodes) {
+        for (const n of def.nodes) {
             const resolved = n.resolvedHandles?.outputs;
             const desc = this.registry.nodes.get(n.typeId);
             const handles = Object.keys(resolved ?? desc?.outputs ?? {});
@@ -829,19 +838,17 @@ class RemoteGraphRunner extends AbstractGraphRunner {
         }
         return out;
     }
-    getInputs() {
+    getInputs(def) {
         const out = {};
         const cache = this.valueCache;
-        if (!this.currentDef)
-            return out;
-        for (const n of this.currentDef.nodes) {
+        for (const n of def.nodes) {
             const staged = this.stagedInputs[n.nodeId] ?? {};
             const resolved = n.resolvedHandles?.inputs;
             const desc = this.registry.nodes.get(n.typeId);
             const handles = Object.keys(resolved ?? desc?.inputs ?? {});
             const cur = {};
             // Build inbound handle set for this node to honor wiring precedence
-            const inbound = new Set(this.currentDef.edges
+            const inbound = new Set(def.edges
                 .filter((e) => e.target.nodeId === n.nodeId)
                 .map((e) => e.target.handle));
             for (const h of handles) {
@@ -860,11 +867,9 @@ class RemoteGraphRunner extends AbstractGraphRunner {
         }
         return out;
     }
-    getInputDefaults() {
+    getInputDefaults(def) {
         const out = {};
-        if (!this.currentDef)
-            return out;
-        for (const n of this.currentDef.nodes) {
+        for (const n of def.nodes) {
             const dynDefaults = n.resolvedHandles?.inputDefaults ?? {};
             if (Object.keys(dynDefaults).length > 0) {
                 out[n.nodeId] = dynDefaults;
@@ -1789,9 +1794,9 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
     const valuesTick = versionTick + graphTick + graphUiTick;
     // Def and IO values
     const def = wb.export();
-    const inputsMap = React.useMemo(() => runner.getInputs(), [runner, valuesTick]);
-    const inputDefaultsMap = React.useMemo(() => runner.getInputDefaults(), [runner, valuesTick]);
-    const outputsMap = React.useMemo(() => runner.getOutputs(), [runner, valuesTick]);
+    const inputsMap = React.useMemo(() => runner.getInputs(def), [runner, def, valuesTick]);
+    const inputDefaultsMap = React.useMemo(() => runner.getInputDefaults(def), [runner, def, valuesTick]);
+    const outputsMap = React.useMemo(() => runner.getOutputs(def), [runner, def, valuesTick]);
     const outputTypesMap = React.useMemo(() => {
         const out = {};
         // Local: runtimeTypeId is not stored; derive from typed wrapper in outputsMap
@@ -2191,13 +2196,14 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
             offRunnerTransport();
         };
     }, [runner, wb]);
-    // Keep runner.currentDef in sync with the workbench graph at all times.
-    // When an engine/runtime exists, this also pushes incremental wiring changes into it.
+    // Push incremental updates into running engine without full reload
     React.useEffect(() => {
-        try {
-            runner.update(def);
+        if (runner.isRunning()) {
+            try {
+                runner.update(def);
+            }
+            catch { }
         }
-        catch { }
     }, [runner, def, graphTick]);
     const validationByNode = React.useMemo(() => {
         const inputs = {};
@@ -3465,7 +3471,7 @@ function WorkbenchStudioCanvas({ setRegistry, autoScroll, onAutoScrollChange, ex
         const off1 = wb.on("graphChanged", () => {
             try {
                 const cur = wb.export();
-                const inputs = runner.getInputs();
+                const inputs = runner.getInputs(cur);
                 onChange({ def: cur, inputs });
             }
             catch { }
@@ -3473,7 +3479,7 @@ function WorkbenchStudioCanvas({ setRegistry, autoScroll, onAutoScrollChange, ex
         const off2 = runner.on("value", () => {
             try {
                 const cur = wb.export();
-                const inputs = runner.getInputs();
+                const inputs = runner.getInputs(cur);
                 onChange({ def: cur, inputs });
             }
             catch { }
@@ -3519,7 +3525,7 @@ function WorkbenchStudioCanvas({ setRegistry, autoScroll, onAutoScrollChange, ex
     const downloadGraph = React.useCallback(() => {
         try {
             const def = wb.export();
-            const inputs = runner.getInputs();
+            const inputs = runner.getInputs(def);
             const payload = { def, inputs };
             const pretty = JSON.stringify(payload, null, 2);
             const blob = new Blob([pretty], { type: "application/json" });