@bian-womp/spark-workbench 0.2.32 → 0.2.34

package/lib/cjs/index.cjs

@@ -567,7 +567,10 @@ class LocalGraphRunner extends AbstractGraphRunner {
             this.build(payload.def);
         this.setEnvironment?.(payload.environment || {}, { merge: false });
         // Hydrate via runtime for exact restore and re-emit
-        this.runtime?.hydrate({ inputs: payload.inputs || {}, outputs: payload.outputs || {} }, { reemit: true });
+        this.runtime?.hydrate({
+            inputs: payload.inputs || {},
+            outputs: payload.outputs || {},
+        });
     }
     dispose() {
         super.dispose();
@@ -1629,7 +1632,7 @@ function toReactFlow(def, positions, registry, opts) {
     });
     const edges = def.edges.map((e) => {
         const st = opts.edgeStatus?.[e.id];
-        const isRunning = !!st?.activeRuns;
+        const isRunning = (st?.activeRuns || 0) > 0;
         const hasError = !!st?.lastError;
         const isInvalidEdge = !!opts.edgeValidation?.[e.id];
         const sourceMissing = !validHandleMap[e.source.nodeId]?.outputs.has(e.source.handle);
@@ -1666,7 +1669,7 @@ function getNodeBorderClassNames(args) {
     const hasError = !!status.lastError;
     const hasValidationError = issues.some((i) => i.level === "error");
     const hasValidationWarning = !hasValidationError && issues.length > 0;
-    const isRunning = !!status.activeRuns;
+    const isRunning = (status.activeRuns || 0) > 0;
     const isInvalid = !!status.invalidated && !isRunning && !hasError;
     // Keep border width constant to avoid layout reflow on selection toggles
     const borderWidth = "border";
@@ -1796,8 +1799,16 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
             const next = { ...prev };
             for (const n of def.nodes) {
                 const cur = next[n.nodeId] ?? (next[n.nodeId] = {});
+                const updates = {};
                 if (cur.invalidated === undefined) {
-                    next[n.nodeId] = { ...cur, invalidated: true };
+                    updates.invalidated = true;
+                }
+                // Ensure activeRunIds is always initialized as an array
+                if (cur.activeRunIds === undefined) {
+                    updates.activeRunIds = [];
+                }
+                if (Object.keys(updates).length > 0) {
+                    next[n.nodeId] = { ...cur, ...updates };
                 }
             }
             return next;
@@ -2001,13 +2012,23 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
                 return;
             if (s.kind === "node-start") {
                 const id = s.nodeId;
+                const runId = s.runId;
+                // Validate runId is a non-empty string
+                const isValidRunId = runId && typeof runId === "string" && runId.length > 0;
+                if (!isValidRunId) {
+                    console.warn(`[WorkbenchContext] node-start event missing or invalid runId for node ${id}`, { runId, event: s });
+                }
                 setNodeStatus((prev) => {
                     const current = prev[id]?.activeRuns ?? 0;
+                    const currentRunIds = prev[id]?.activeRunIds ?? [];
                     return {
                         ...prev,
                         [id]: {
                             ...prev[id],
                             activeRuns: current + 1,
+                            activeRunIds: isValidRunId
+                                ? [...currentRunIds, runId]
+                                : currentRunIds,
                             progress: 0,
                             invalidated: false,
                         },
@@ -2029,13 +2050,23 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
             else if (s.kind === "node-done") {
                 const id = s.nodeId;
                 const runId = s.runId;
+                // Validate runId is a non-empty string
+                const isValidRunId = runId && typeof runId === "string" && runId.length > 0;
                 setNodeStatus((prev) => {
                     const current = prev[id]?.activeRuns ?? 0;
-                    const nextActive = current - 1;
-                    const hadError = !!(runId && errorRunsRef.current[id]?.[runId]);
+                    const currentRunIds = prev[id]?.activeRunIds ?? [];
+                    if (isValidRunId && !currentRunIds.includes(runId)) {
+                        console.warn(`[WorkbenchContext] node-done event for unknown runId: node=${id} runId=${runId}`, { event: s, currentRunIds });
+                        return prev; // Ignore stale event
+                    }
+                    const nextActive = Math.max(0, current - 1); // Prevent negative values
+                    const nextRunIds = isValidRunId
+                        ? currentRunIds.filter((rid) => rid !== runId)
+                        : currentRunIds;
+                    const hadError = !!(isValidRunId && errorRunsRef.current[id]?.[runId]);
                     const keepProgress = hadError || nextActive > 0;
                     // Clear error flag for this runId
-                    if (runId && errorRunsRef.current[id]?.[runId]) {
+                    if (isValidRunId && errorRunsRef.current[id]?.[runId]) {
                         delete errorRunsRef.current[id]?.[runId];
                     }
                     return {
@@ -2043,6 +2074,7 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
                         [id]: {
                             ...prev[id],
                             activeRuns: nextActive,
+                            activeRunIds: nextRunIds,
                             progress: keepProgress ? prev[id]?.progress : 0,
                             lastError: hadError ? prev[id]?.lastError : undefined,
                         },
@@ -2072,7 +2104,7 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
                     const current = prev[id]?.activeRuns ?? 0;
                     return {
                         ...prev,
-                        [id]: { ...prev[id], activeRuns: current - 1 },
+                        [id]: { ...prev[id], activeRuns: Math.max(0, current - 1) }, // Prevent negative values
                     };
                 });
             }
@@ -2354,7 +2386,7 @@ function Inspector({ debug, autoScroll, hideWorkbench, onAutoScrollChange, onHid
             return String(value ?? "");
         }
     };
-    const { registry, def, selectedNodeId, selectedEdgeId, inputsMap, outputsMap, outputTypesMap, nodeStatus, validationByNode, validationByEdge, validationGlobal, valuesTick, updateEdgeType, systemErrors, registryErrors, clearSystemErrors, clearRegistryErrors, removeSystemError, removeRegistryError, } = useWorkbenchContext();
+    const { registry, def, selectedNodeId, selectedEdgeId, inputsMap, outputsMap, outputTypesMap, nodeStatus, edgeStatus, validationByNode, validationByEdge, validationGlobal, valuesTick, updateEdgeType, systemErrors, registryErrors, clearSystemErrors, clearRegistryErrors, removeSystemError, removeRegistryError, } = useWorkbenchContext();
     const nodeValidationIssues = validationByNode.issues;
     const edgeValidationIssues = validationByEdge.issues;
     const nodeValidationHandles = validationByNode;
@@ -2443,7 +2475,10 @@ function Inspector({ debug, autoScroll, hideWorkbench, onAutoScrollChange, onHid
     return (jsxRuntime.jsxs("div", { className: `${widthClass} border-l border-gray-300 p-3 flex flex-col h-full min-h-0 overflow-auto`, children: [jsxRuntime.jsxs("div", { className: "flex-1 overflow-auto", children: [contextPanel && jsxRuntime.jsx("div", { className: "mb-2", children: contextPanel }), systemErrors.length > 0 && (jsxRuntime.jsxs("div", { className: "mb-2 space-y-1", children: [systemErrors.map((err, i) => (jsxRuntime.jsxs("div", { className: "text-xs text-red-700 bg-red-50 border border-red-200 rounded px-2 py-1 flex items-start justify-between gap-2", children: [jsxRuntime.jsxs("div", { className: "flex-1", children: [jsxRuntime.jsx("div", { className: "font-semibold", children: err.code ? `Error ${err.code}` : "Error" }), jsxRuntime.jsx("div", { className: "break-words", children: err.message })] }), jsxRuntime.jsx("button", { className: "text-red-500 hover:text-red-700 text-[10px] px-1", onClick: () => removeSystemError(i), title: "Dismiss", children: jsxRuntime.jsx(react$1.XIcon, { size: 10 }) })] }, i))), systemErrors.length > 1 && (jsxRuntime.jsx("button", { className: "text-xs text-red-600 hover:text-red-800 underline", onClick: clearSystemErrors, children: "Clear all" }))] })), registryErrors.length > 0 && (jsxRuntime.jsxs("div", { className: "mb-2 space-y-1", children: [registryErrors.map((err, i) => (jsxRuntime.jsxs("div", { className: "text-xs text-amber-700 bg-amber-50 border border-amber-200 rounded px-2 py-1 flex items-start justify-between gap-2", children: [jsxRuntime.jsxs("div", { className: "flex-1", children: [jsxRuntime.jsx("div", { className: "font-semibold", children: "Registry Error" }), jsxRuntime.jsx("div", { className: "break-words", children: err.message }), err.attempt && err.maxAttempts && (jsxRuntime.jsxs("div", { className: "text-[10px] text-amber-600 mt-1", children: ["Attempt ", err.attempt, " of ", err.maxAttempts] }))] }), jsxRuntime.jsx("button", { className: "text-amber-500 hover:text-amber-700 text-[10px] px-1", onClick: () => removeRegistryError(i), title: "Dismiss", children: jsxRuntime.jsx(react$1.XIcon, { size: 10 }) })] }, i))), registryErrors.length > 1 && (jsxRuntime.jsx("button", { className: "text-xs text-amber-600 hover:text-amber-800 underline", onClick: clearRegistryErrors, children: "Clear all" }))] })), jsxRuntime.jsx("div", { className: "font-semibold mb-2", children: "Inspector" }), jsxRuntime.jsxs("div", { className: "text-xs text-gray-500 mb-2", children: ["valuesTick: ", valuesTick] }), jsxRuntime.jsx("div", { className: "flex-1", children: !selectedNode && !selectedEdge ? (jsxRuntime.jsxs("div", { children: [jsxRuntime.jsx("div", { className: "text-gray-500", children: "Select a node or edge." }), globalValidationIssues && globalValidationIssues.length > 0 && (jsxRuntime.jsxs("div", { className: "mt-2 text-xs bg-red-50 border border-red-200 rounded px-2 py-1", children: [jsxRuntime.jsx("div", { className: "font-semibold mb-1", children: "Validation" }), jsxRuntime.jsx("ul", { className: "list-disc ml-4", children: globalValidationIssues.map((m, i) => (jsxRuntime.jsxs("li", { className: "flex items-center gap-1", children: [jsxRuntime.jsx(IssueBadge, { level: m.level, size: 24, className: "w-6 h-6" }), jsxRuntime.jsx("span", { children: `${m.code}: ${m.message}` }), !!m.data?.edgeId && (jsxRuntime.jsx("button", { className: "ml-2 text-[10px] px-1 py-[2px] border border-red-300 rounded text-red-700 hover:bg-red-50", onClick: (e) => {
                                                             e.stopPropagation();
                                                             deleteEdgeById(m.data?.edgeId);
-                                                        }, title: "Delete referenced edge", children: "Delete edge" }))] }, i))) })] }))] })) : selectedEdge ? (jsxRuntime.jsxs("div", { children: [jsxRuntime.jsxs("div", { className: "mb-2", children: [jsxRuntime.jsxs("div", { children: ["Edge: ", selectedEdge.id] }), jsxRuntime.jsxs("div", { children: [selectedEdge.source.nodeId, ".", selectedEdge.source.handle, " \u2192", " ", selectedEdge.target.nodeId, ".", selectedEdge.target.handle] }), jsxRuntime.jsx("div", { className: "mt-1", children: jsxRuntime.jsx("button", { className: "text-xs px-2 py-1 border border-red-300 rounded text-red-700 hover:bg-red-50", onClick: (e) => {
+                                                        }, title: "Delete referenced edge", children: "Delete edge" }))] }, i))) })] }))] })) : selectedEdge ? (jsxRuntime.jsxs("div", { children: [jsxRuntime.jsxs("div", { className: "mb-2", children: [jsxRuntime.jsxs("div", { children: ["Edge: ", selectedEdge.id] }), jsxRuntime.jsxs("div", { children: [selectedEdge.source.nodeId, ".", selectedEdge.source.handle, " \u2192", " ", selectedEdge.target.nodeId, ".", selectedEdge.target.handle] }), (() => {
+                                            const status = edgeStatus?.[selectedEdge.id];
+                                            return status?.activeRuns > 0 ? (jsxRuntime.jsxs("div", { className: "mt-1 text-xs text-blue-700 bg-blue-50 border border-blue-200 rounded px-2 py-1", children: [jsxRuntime.jsxs("div", { className: "font-semibold", children: ["Running (", status.activeRuns, ")"] }), jsxRuntime.jsx("div", { className: "text-[10px] text-blue-600 mt-1", children: "Note: Edge runIds are not available in stats events" })] })) : null;
+                                        })(), jsxRuntime.jsx("div", { className: "mt-1", children: jsxRuntime.jsx("button", { className: "text-xs px-2 py-1 border border-red-300 rounded text-red-700 hover:bg-red-50", onClick: (e) => {
                                                     e.stopPropagation();
                                                     deleteEdgeById(selectedEdge.id);
                                                 }, title: "Delete this edge", children: "Delete edge" }) }), jsxRuntime.jsxs("div", { className: "flex items-center gap-2 mt-1", children: [jsxRuntime.jsxs("label", { className: "w-20 flex flex-col", children: [jsxRuntime.jsx("span", { children: "Type" }), jsxRuntime.jsx("span", { className: "text-gray-500 text-[11px]", children: "DataTypeId" })] }), jsxRuntime.jsxs("select", { className: "border border-gray-300 rounded px-2 py-1 focus:outline-none focus:ring-2 focus:ring-blue-500 w-full", value: selectedEdge.typeId ?? "", onChange: (e) => {
@@ -2453,7 +2488,9 @@ function Inspector({ debug, autoScroll, hideWorkbench, onAutoScrollChange, onHid
                                                     }, children: [jsxRuntime.jsx("option", { value: "", children: "(infer from source)" }), Array.from(registry.types.keys()).map((tid) => (jsxRuntime.jsx("option", { value: tid, children: tid }, tid)))] })] })] }), selectedEdgeValidation.length > 0 && (jsxRuntime.jsxs("div", { className: "mt-2 text-xs bg-red-50 border border-red-200 rounded px-2 py-1", children: [jsxRuntime.jsx("div", { className: "font-semibold mb-1", children: "Validation" }), jsxRuntime.jsx("ul", { className: "list-disc ml-4", children: selectedEdgeValidation.map((m, i) => (jsxRuntime.jsxs("li", { className: "flex items-center gap-1", children: [jsxRuntime.jsx(IssueBadge, { level: m.level, size: 24, className: "w-6 h-6" }), jsxRuntime.jsx("span", { children: `${m.code}: ${m.message}` }), jsxRuntime.jsx("button", { className: "ml-2 text-[10px] px-1 py-[2px] border border-red-300 rounded text-red-700 hover:bg-red-50", onClick: (e) => {
                                                             e.stopPropagation();
                                                             deleteEdgeById(selectedEdge.id);
-                                                        }, title: "Delete this edge", children: "Delete edge" })] }, i))) })] }))] })) : (jsxRuntime.jsxs("div", { children: [selectedNode && (jsxRuntime.jsxs("div", { className: "mb-2", children: [jsxRuntime.jsxs("div", { children: ["Node: ", selectedNode.nodeId] }), jsxRuntime.jsxs("div", { children: ["Type: ", selectedNode.typeId] }), !!selectedNodeStatus?.lastError && (jsxRuntime.jsx("div", { className: "mt-2 text-sm text-red-700 bg-red-50 border border-red-200 rounded px-2 py-1 break-words", children: String(selectedNodeStatus.lastError?.message ??
+                                                        }, title: "Delete this edge", children: "Delete edge" })] }, i))) })] }))] })) : (jsxRuntime.jsxs("div", { children: [selectedNode && (jsxRuntime.jsxs("div", { className: "mb-2", children: [jsxRuntime.jsxs("div", { children: ["Node: ", selectedNode.nodeId] }), jsxRuntime.jsxs("div", { children: ["Type: ", selectedNode.typeId] }), selectedNodeStatus?.activeRuns &&
+                                            selectedNodeStatus.activeRuns > 0 && (jsxRuntime.jsxs("div", { className: "mt-1 text-xs text-blue-700 bg-blue-50 border border-blue-200 rounded px-2 py-1", children: [jsxRuntime.jsxs("div", { className: "font-semibold", children: ["Running (", selectedNodeStatus.activeRuns, ")"] }), selectedNodeStatus.activeRunIds &&
+                                                    selectedNodeStatus.activeRunIds.length > 0 ? (jsxRuntime.jsxs("div", { className: "mt-1", children: [jsxRuntime.jsx("div", { className: "text-[10px] text-blue-600", children: "RunIds:" }), jsxRuntime.jsx("div", { className: "flex flex-wrap gap-1 mt-1", children: selectedNodeStatus.activeRunIds.map((runId, idx) => (jsxRuntime.jsx("span", { className: "text-[10px] px-1.5 py-0.5 bg-blue-100 border border-blue-300 rounded font-mono", children: runId }, idx))) })] })) : (jsxRuntime.jsx("div", { className: "text-[10px] text-blue-600 mt-1", children: "RunIds not available (some runs may have started without runId)" }))] })), !!selectedNodeStatus?.lastError && (jsxRuntime.jsx("div", { className: "mt-2 text-sm text-red-700 bg-red-50 border border-red-200 rounded px-2 py-1 break-words", children: String(selectedNodeStatus.lastError?.message ??
                                                 selectedNodeStatus.lastError) }))] })), jsxRuntime.jsxs("div", { className: "mb-2", children: [jsxRuntime.jsx("div", { className: "font-semibold mb-1", children: "Inputs" }), inputHandles.length === 0 ? (jsxRuntime.jsx("div", { className: "text-gray-500", children: "No inputs" })) : (inputHandles.map((h) => {
                                             const typeId = sparkGraph.getInputTypeId(effectiveHandles.inputs, h);
                                             const isLinked = def.edges.some((e) => e.target.nodeId === selectedNodeId &&