@bian-womp/spark-graph 0.2.77 → 0.2.79

package/lib/cjs/index.cjs

@@ -487,6 +487,7 @@ class GraphRuntime {
                 logLevel: desc.logLevel,
                 runSeq: 0,
                 activeControllers: new Set(),
+                controllerRunIds: new Map(),
                 queue: [],
                 stats: {
                     runs: 0,
@@ -731,6 +732,7 @@ class GraphRuntime {
             node.stats.lastStartAt = now;
             node.stats.progress = 0;
             node.activeControllers.add(controller);
+            node.controllerRunIds.set(controller, runId);
             const mode = policy.asyncConcurrency ?? "switch";
             if (mode === "switch") {
                 for (const c of Array.from(node.activeControllers)) {
@@ -745,6 +747,10 @@ class GraphRuntime {
             const ctx = this.createExecutionContext(nodeId, node, capturedInputs, runId, controller.signal, {
                 emitHandler: (handle, value) => {
                     const m = policy.asyncConcurrency ?? "switch";
+                    // Drop emits from runs that were explicitly cancelled due to a
+                    // snapshot/undo/redo operation, regardless of asyncConcurrency.
+                    if (node.snapshotCancelledRunIds?.has(runId))
+                        return;
                     if (m !== "merge" && runId !== node.latestRunId)
                         return;
                     this.propagate(nodeId, handle, value);
@@ -792,6 +798,7 @@ class GraphRuntime {
                     if (timeoutId)
                         clearTimeout(timeoutId);
                     node.activeControllers.delete(controller);
+                    node.controllerRunIds.delete(controller);
                     node.stats.active = Math.max(0, node.activeControllers.size);
                     node.stats.lastEndAt = Date.now();
                     node.stats.lastDurationMs =
@@ -1370,7 +1377,14 @@ class GraphRuntime {
             const node = this.nodes.get(nodeId);
             if (!node)
                 continue;
+            if (!node.snapshotCancelledRunIds) {
+                node.snapshotCancelledRunIds = new Set();
+            }
             for (const controller of Array.from(node.activeControllers)) {
+                const rid = node.controllerRunIds.get(controller);
+                if (rid) {
+                    node.snapshotCancelledRunIds.add(rid);
+                }
                 try {
                     controller.abort("snapshot");
                 }
@@ -1379,6 +1393,7 @@ class GraphRuntime {
                 }
             }
             node.activeControllers.clear();
+            node.controllerRunIds.clear();
             node.stats.active = 0;
             node.queue = [];
             node.runSeq += 1;
@@ -1487,6 +1502,7 @@ class GraphRuntime {
                     },
                     runSeq: 0,
                     activeControllers: new Set(),
+                    controllerRunIds: new Map(),
                     queue: [],
                     stats: {
                         runs: 0,