@bian-womp/spark-workbench 0.2.13 → 0.2.15

package/lib/cjs/index.cjs

@@ -761,8 +761,9 @@ class RemoteGraphRunner extends AbstractGraphRunner {
         if (!cache)
             return out;
         for (const n of def.nodes) {
+            const resolved = n.resolvedHandles?.outputs;
             const desc = this.registry.nodes.get(n.typeId);
-            const handles = Object.keys(desc?.outputs ?? {});
+            const handles = Object.keys(resolved ?? desc?.outputs ?? {});
             for (const h of handles) {
                 const key = `${n.nodeId}.${h}`;
                 const rec = cache.get(key);
@@ -780,8 +781,9 @@ class RemoteGraphRunner extends AbstractGraphRunner {
         const cache = this.valueCache;
         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(desc?.inputs ?? {});
+            const handles = Object.keys(resolved ?? desc?.inputs ?? {});
             const cur = {};
             for (const h of handles) {
                 const rec = cache.get(`${n.nodeId}.${h}`);
@@ -1196,10 +1198,18 @@ function toReactFlow(def, positions, registry, opts) {
     }
     const nodes = def.nodes.map((n) => {
         const desc = registry.nodes.get(n.typeId);
-        const inputHandles = Object.entries(desc?.inputs ?? {})
-            .filter(([id]) => !sparkGraph.isInputPrivate(desc?.inputs, id))
-            .map(([id, v]) => ({ id, typeId: sparkGraph.getInputTypeId(desc?.inputs, id) }));
-        const outputHandles = Object.entries(desc?.outputs ?? {}).map(([id, typeId]) => ({ id, typeId: formatDeclaredTypeSignature(typeId) }));
+        // Prefer per-node resolved handles when present
+        const resolvedInputs = n.resolvedHandles?.inputs;
+        const resolvedOutputs = n.resolvedHandles?.outputs;
+        const inputSource = resolvedInputs ?? desc?.inputs ?? {};
+        const outputSource = resolvedOutputs ?? desc?.outputs ?? {};
+        const inputHandles = Object.entries(inputSource)
+            .filter(([id]) => !sparkGraph.isInputPrivate(inputSource, id))
+            .map(([id]) => ({ id, typeId: sparkGraph.getInputTypeId(inputSource, id) }));
+        const outputHandles = Object.entries(outputSource).map(([id, typeId]) => ({
+            id,
+            typeId: formatDeclaredTypeSignature(typeId),
+        }));
         nodeHandleMap[n.nodeId] = {
             inputs: new Set(inputHandles.map((h) => h.id)),
             outputs: new Set(outputHandles.map((h) => h.id)),
@@ -1519,6 +1529,27 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
             ];
             return next.length > 200 ? next.slice(0, 200) : next;
         });
+        // Helper to refresh resolved handles from remote and merge into workbench
+        const refreshResolvedHandles = async () => {
+            try {
+                const snap = await runner.snapshotFull();
+                const remoteDef = snap?.def;
+                if (remoteDef && Array.isArray(remoteDef.nodes)) {
+                    const cur = wb.export();
+                    const merged = {
+                        ...cur,
+                        nodes: cur.nodes.map((n) => {
+                            const rn = (remoteDef.nodes || []).find((m) => m.nodeId === n.nodeId);
+                            if (rn && rn.resolvedHandles)
+                                return { ...n, resolvedHandles: rn.resolvedHandles };
+                            return n;
+                        }),
+                    };
+                    await wb.load(merged);
+                }
+            }
+            catch { }
+        };
         const off1 = runner.on("value", (e) => {
             if (e?.io === "input") {
                 const nodeId = e?.nodeId;
@@ -1526,6 +1557,8 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
                     ...s,
                     [nodeId]: { ...s[nodeId], invalidated: true },
                 }));
+                // On any input change, refresh resolved handles (covers context-driven dynamic ports)
+                refreshResolvedHandles();
             }
             return add("runner", "value")(e);
         });
@@ -1569,6 +1602,9 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, children, }) {
                     return next;
                 });
             }
+            // After build/update, pull resolved handles from remote snapshot and merge into local def for UI
+            if (e?.reason === "graph-updated" || e?.reason === "graph-built")
+                refreshResolvedHandles();
             return add("runner", "invalidate")(e);
         });
         const off3b = runner.on("stats", (s) => {
@@ -2119,10 +2155,10 @@ const DefaultNode = React.memo(function DefaultNode({ id, data, selected, isConn
             position: "relative",
             minWidth: typeof data.renderWidth === "number" ? data.renderWidth : undefined,
             minHeight: typeof data.renderHeight === "number" ? data.renderHeight : undefined,
-        }, children: [jsxRuntime.jsx(DefaultNodeHeader, { id: id, title: typeId, status: status, validation: validation }), jsxRuntime.jsx(DefaultNodeContent, { data: data, isConnectable: isConnectable })] }));
+        }, children: [jsxRuntime.jsx(DefaultNodeHeader, { id: id, title: typeId, validation: validation, showId: data.showValues }), jsxRuntime.jsx(DefaultNodeContent, { data: data, isConnectable: isConnectable })] }));
 });
 DefaultNode.displayName = "DefaultNode";
-function DefaultNodeHeader({ id, title, status, validation, right, onInvalidate, }) {
+function DefaultNodeHeader({ id, title, validation, right, showId, onInvalidate, }) {
     const ctx = useWorkbenchContext();
     const handleInvalidate = React.useCallback(() => {
         try {
@@ -2142,11 +2178,11 @@ function DefaultNodeHeader({ id, title, status, validation, right, onInvalidate,
         }, children: [jsxRuntime.jsx("strong", { className: "flex-1 h-full text-sm", style: { lineHeight: `${NODE_HEADER_HEIGHT_PX}px` }, children: title }), jsxRuntime.jsxs("div", { className: "flex items-center gap-1", children: [jsxRuntime.jsx("button", { className: "w-4 h-4 border border-gray-400 rounded text-[10px] leading-3 flex items-center justify-center", title: "Invalidate and re-run", onClick: (e) => {
                             e.stopPropagation();
                             handleInvalidate();
-                        }, children: "\u21BB" }), right, validation.issues && validation.issues.length > 0 && (jsxRuntime.jsx(IssueBadge, { level: validation.issues.some((i) => i.level === "error")
+                        }, children: jsxRuntime.jsx(react$1.ArrowClockwiseIcon, { size: 10 }) }), right, validation.issues && validation.issues.length > 0 && (jsxRuntime.jsx(IssueBadge, { level: validation.issues.some((i) => i.level === "error")
                             ? "error"
                             : "warning", size: 12, className: "w-3 h-3", title: validation.issues
                             .map((v) => `${v.code}: ${v.message}`)
-                            .join("; ") })), jsxRuntime.jsxs("span", { className: "text-[10px] opacity-70", children: ["(", id, ")"] })] })] }));
+                            .join("; ") })), showId && jsxRuntime.jsxs("span", { className: "text-[10px] opacity-70", children: ["(", id, ")"] })] })] }));
 }
 function DefaultNodeContent({ data, isConnectable, }) {
     const { showValues, inputValues, outputValues, toString } = data;
@@ -2911,8 +2947,11 @@ function WorkbenchStudioCanvas({ setRegistry, autoScroll, onAutoScrollChange, ex
                     if (positions && typeof positions === "object")
                         wb.setPositions(positions);
                 }
+                else if (!runner.isRunning()) {
+                    alert("Engine is not running");
+                }
                 else {
-                    alert("Graph definition is empty or engine is not running");
+                    alert("Graph definition is empty");
                 }
             }
             else {