@bian-womp/spark-workbench 0.2.69 → 0.2.70

package/lib/esm/index.js

@@ -1,4 +1,5 @@
 import { generateId, GraphBuilder, createEngine, StepEngine, PullEngine, BatchedEngine, isTypedOutput, getTypedOutputValue, getTypedOutputTypeId, isInputPrivate, getInputTypeId, createSimpleGraphRegistry, createSimpleGraphDef, createAsyncGraphDef, createAsyncGraphRegistry, createProgressGraphDef, createProgressGraphRegistry, createValidationGraphDef, createValidationGraphRegistry } from '@bian-womp/spark-graph';
+import lod from 'lodash';
 import { RuntimeApiClient } from '@bian-womp/spark-remote';
 import { Position, Handle, useUpdateNodeInternals, useReactFlow, ReactFlowProvider, ReactFlow, Background, BackgroundVariant, MiniMap, Controls } from '@xyflow/react';
 import React, { useCallback, useState, useRef, useEffect, useMemo, createContext, useContext, useImperativeHandle } from 'react';
@@ -208,18 +209,19 @@ class InMemoryWorkbench extends AbstractWorkbench {
                 inputs: options?.inputs,
                 copyOutputsFrom: options?.copyOutputsFrom,
             },
-            dry: options?.dry,
+            ...lod.pick(options, ["dry", "commit", "reason"]),
         });
         this.refreshValidation();
         return id;
     }
-    removeNode(nodeId) {
+    removeNode(nodeId, options) {
         this.def.nodes = this.def.nodes.filter((n) => n.nodeId !== nodeId);
         this.def.edges = this.def.edges.filter((e) => e.source.nodeId !== nodeId && e.target.nodeId !== nodeId);
         delete this.positions[nodeId];
         this.emit("graphChanged", {
             def: this.def,
             change: { type: "removeNode", nodeId },
+            ...options,
         });
         this.refreshValidation();
     }
@@ -234,16 +236,17 @@ class InMemoryWorkbench extends AbstractWorkbench {
         this.emit("graphChanged", {
             def: this.def,
             change: { type: "connect", edgeId: id },
-            dry: options?.dry,
+            ...options,
         });
         this.refreshValidation();
         return id;
     }
-    disconnect(edgeId) {
+    disconnect(edgeId, options) {
         this.def.edges = this.def.edges.filter((e) => e.id !== edgeId);
         this.emit("graphChanged", {
             def: this.def,
             change: { type: "disconnect", edgeId },
+            ...options,
         });
         this.emit("validationChanged", this.validate());
     }
@@ -272,32 +275,32 @@ class InMemoryWorkbench extends AbstractWorkbench {
         });
     }
     // Position and selection APIs for React Flow bridge
-    setPosition(nodeId, pos, opts) {
+    setPosition(nodeId, pos, options) {
         this.positions[nodeId] = pos;
         this.emit("graphUiChanged", {
             def: this.def,
             change: { type: "moveNode", nodeId, pos },
-            commit: !!opts?.commit === true,
+            ...options,
         });
     }
-    setPositions(map, opts) {
+    setPositions(map, options) {
         this.positions = { ...map };
         this.emit("graphUiChanged", {
             def: this.def,
             change: { type: "moveNodes" },
-            commit: opts?.commit,
+            ...options,
         });
     }
     getPositions() {
         return { ...this.positions };
     }
-    setSelection(sel, opts) {
+    setSelection(sel, options) {
         this.selection = { nodes: [...sel.nodes], edges: [...sel.edges] };
         this.emit("selectionChanged", this.selection);
         this.emit("graphUiChanged", {
             def: this.def,
             change: { type: "selection" },
-            commit: opts?.commit,
+            ...options,
         });
     }
     getSelection() {
@@ -309,7 +312,7 @@ class InMemoryWorkbench extends AbstractWorkbench {
     /**
      * Delete all selected nodes and edges.
      */
-    deleteSelection() {
+    deleteSelection(options) {
         const selection = this.getSelection();
         // Delete all selected nodes (this will also remove connected edges)
         for (const nodeId of selection.nodes) {
@@ -320,14 +323,14 @@ class InMemoryWorkbench extends AbstractWorkbench {
             this.disconnect(edgeId);
         }
         // Clear selection
-        this.setSelection({ nodes: [], edges: [] });
+        this.setSelection({ nodes: [], edges: [] }, options);
     }
-    setViewport(viewport, opts) {
+    setViewport(viewport, options) {
         this.viewport = { ...viewport };
         this.emit("graphUiChanged", {
             def: this.def,
             change: { type: "viewport" },
-            commit: opts?.commit,
+            ...options,
         });
     }
     getViewport() {
@@ -472,7 +475,7 @@ class InMemoryWorkbench extends AbstractWorkbench {
      * Returns the mapping from original node IDs to new node IDs.
      * Uses copyOutputsFrom to copy outputs from original nodes (like duplicate does).
      */
-    pasteCopiedData(data, center) {
+    pasteCopiedData(data, center, options) {
         const nodeIdMap = new Map();
         const edgeIds = [];
         // Add nodes
@@ -512,10 +515,7 @@ class InMemoryWorkbench extends AbstractWorkbench {
             }
         }
         // Select the newly pasted nodes
-        this.setSelection({
-            nodes: Array.from(nodeIdMap.values()),
-            edges: edgeIds,
-        });
+        this.setSelection({ nodes: Array.from(nodeIdMap.values()), edges: edgeIds }, options);
         return { nodeIdMap, edgeIds };
     }
     /**
@@ -684,7 +684,7 @@ class AbstractGraphRunner {
         return false;
     }
     // Optional commit support
-    async commit() { }
+    async commit(_reason) { }
 }
 
 // Counter for generating readable runner IDs
@@ -1431,10 +1431,10 @@ class RemoteGraphRunner extends AbstractGraphRunner {
         const client = await this.ensureClient();
         await client.setExtData(data);
     }
-    async commit() {
+    async commit(reason) {
         const client = await this.ensureClient();
         try {
-            await client.commit();
+            await client.commit(reason);
         }
         catch (err) {
             console.error("[RemoteGraphRunner] Error committing:", err);
@@ -1914,7 +1914,7 @@ function useWorkbenchBridge(wb) {
         wb.connect({
             source: { nodeId: params.source, handle: params.sourceHandle },
             target: { nodeId: params.target, handle: params.targetHandle },
-        });
+        }, { commit: true });
     }, [wb]);
     const onNodesChange = useCallback((changes) => {
         // Apply position updates continuously, but mark commit only on drag end
@@ -1957,7 +1957,7 @@ function useWorkbenchBridge(wb) {
             });
         }
     }, [wb]);
-    const onEdgesDelete = useCallback((edges) => edges.forEach((e) => wb.disconnect(e.id)), [wb]);
+    const onEdgesDelete = useCallback((edges) => edges.forEach((e, idx) => wb.disconnect(e.id, { commit: idx === edges.length - 1 })), [wb]);
     const onEdgesChange = useCallback((changes) => {
         const current = wb.getSelection();
         const nextEdgeIds = new Set(current.edges);
@@ -1993,8 +1993,7 @@ function useWorkbenchBridge(wb) {
         }
     }, [wb]);
     const onNodesDelete = useCallback((nodes) => {
-        for (const n of nodes)
-            wb.removeNode(n.id);
+        nodes.forEach((n, idx) => wb.removeNode(n.id, { commit: idx === nodes.length - 1 }));
     }, [wb]);
     return {
         onConnect,
@@ -2687,7 +2686,7 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
             }
             curX += maxWidth + H_GAP;
         }
-        wb.setPositions(pos, { commit: true });
+        wb.setPositions(pos, { commit: true, reason: "auto-layout" });
     }, [wb, registry, overrides?.getDefaultNodeSize]);
     const updateEdgeType = useCallback((edgeId, typeId) => wb.updateEdgeType(edgeId, typeId), [wb]);
     const triggerExternal = useCallback((nodeId, event) => runner.triggerExternal(nodeId, event), [runner]);
@@ -2943,11 +2942,36 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
             }
         });
         const offWbGraphChangedForUpdate = wb.on("graphChanged", async (event) => {
+            // Build detailed reason from change type
+            let reason = "graph-changed";
+            if (event.change) {
+                const changeType = event.change.type;
+                if (changeType === "addNode") {
+                    reason = "add-node";
+                }
+                else if (changeType === "removeNode") {
+                    reason = "remove-node";
+                }
+                else if (changeType === "connect") {
+                    reason = "connect-edge";
+                }
+                else if (changeType === "disconnect") {
+                    reason = "disconnect-edge";
+                }
+                else if (changeType === "updateParams") {
+                    reason = "update-node-params";
+                }
+                else if (changeType === "updateEdgeType") {
+                    reason = "update-edge-type";
+                }
+            }
             if (!runner.isRunning()) {
-                // If runner not running, commit immediately (no update needed)
-                await runner.commit().catch((err) => {
-                    console.error("[WorkbenchContext] Error committing:", err);
-                });
+                if (event.commit) {
+                    // If runner not running, commit immediately (no update needed)
+                    await runner.commit(reason).catch((err) => {
+                        console.error("[WorkbenchContext] Error committing:", err);
+                    });
+                }
                 return;
             }
             try {
@@ -2972,10 +2996,12 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
                 else {
                     await runner.update(event.def, { dry: event.dry });
                 }
-                // Wait for update to complete, then commit
-                await runner.commit().catch((err) => {
-                    console.error("[WorkbenchContext] Error committing after update:", err);
-                });
+                if (event.commit) {
+                    // Wait for update to complete, then commit
+                    await runner.commit(event.reason ?? reason).catch((err) => {
+                        console.error("[WorkbenchContext] Error committing after update:", err);
+                    });
+                }
             }
             catch (err) {
                 console.error("[WorkbenchContext] Error updating graph:", err);
@@ -2985,15 +3011,22 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
         const offWbSelectionChanged = wb.on("selectionChanged", async (sel) => {
             setSelectedNodeId(sel.nodes?.[0]);
             setSelectedEdgeId(sel.edges?.[0]);
-            // Commit on selection change
-            await runner.commit().catch((err) => {
-                console.error("[WorkbenchContext] Error committing selection change:", err);
-            });
+            if (sel.commit) {
+                // Commit on selection change
+                await runner.commit(sel.reason ?? "selection").catch((err) => {
+                    console.error("[WorkbenchContext] Error committing selection change:", err);
+                });
+            }
         });
         const offWbGraphUiChanged = wb.on("graphUiChanged", async (event) => {
             // Only commit if commit flag is true (e.g., drag end, not during dragging)
             if (event.commit) {
-                await runner.commit().catch((err) => {
+                if (event.change) {
+                    event.change.type;
+                }
+                await runner
+                    .commit(event.reason ?? "ui-changed")
+                    .catch((err) => {
                     console.error("[WorkbenchContext] Error committing UI changes:", err);
                 });
             }
@@ -3209,6 +3242,7 @@ function createNodeContextMenuHandlers(nodeId, wb, runner, registry, outputsMap,
         try {
             const typeId = outputTypesMap?.[nodeId]?.[handleId];
             const raw = outputsMap?.[nodeId]?.[handleId];
+            let newNodeId;
             if (!typeId || raw === undefined)
                 return;
             const unwrap = (v) => isTypedOutput(v) ? getTypedOutputValue(v) : v;
@@ -3234,23 +3268,21 @@ function createNodeContextMenuHandlers(nodeId, wb, runner, registry, outputsMap,
                 const nodeDesc = registry.nodes.get(singleTarget.nodeTypeId);
                 const inType = getInputTypeId(nodeDesc?.inputs, singleTarget.inputHandle);
                 const coerced = await coerceIfNeeded(typeId, inType, unwrap(raw));
-                wb.addNode({
+                newNodeId = wb.addNode({
                     typeId: singleTarget.nodeTypeId,
                     position: { x: pos.x + 180, y: pos.y },
                 }, { inputs: { [singleTarget.inputHandle]: coerced } });
-                return;
             }
-            if (isArray && arrTarget) {
+            else if (isArray && arrTarget) {
                 const nodeDesc = registry.nodes.get(arrTarget.nodeTypeId);
                 const inType = getInputTypeId(nodeDesc?.inputs, arrTarget.inputHandle);
                 const coerced = await coerceIfNeeded(typeId, inType, unwrap(raw));
-                wb.addNode({
+                newNodeId = wb.addNode({
                     typeId: arrTarget.nodeTypeId,
                     position: { x: pos.x + 180, y: pos.y },
                 }, { inputs: { [arrTarget.inputHandle]: coerced } });
-                return;
             }
-            if (isArray && elemTarget) {
+            else if (isArray && elemTarget) {
                 const nodeDesc = registry.nodes.get(elemTarget.nodeTypeId);
                 const inType = getInputTypeId(nodeDesc?.inputs, elemTarget.inputHandle);
                 const src = unwrap(raw);
@@ -3262,19 +3294,21 @@ function createNodeContextMenuHandlers(nodeId, wb, runner, registry, outputsMap,
                 for (let idx = 0; idx < coercedItems.length; idx++) {
                     const col = idx % COLS;
                     const row = Math.floor(idx / COLS);
-                    wb.addNode({
+                    newNodeId = wb.addNode({
                         typeId: elemTarget.nodeTypeId,
                         position: { x: pos.x + (col + 1) * DX, y: pos.y + row * DY },
                     }, { inputs: { [elemTarget.inputHandle]: coercedItems[idx] } });
                 }
-                return;
+            }
+            if (newNodeId) {
+                wb.setSelection({ nodes: [newNodeId], edges: [] }, { commit: true, reason: "bake" });
             }
         }
         catch { }
     };
     return {
         onDelete: () => {
-            wb.removeNode(nodeId);
+            wb.removeNode(nodeId, { commit: true });
             onClose();
         },
         onDuplicate: async () => {
@@ -3299,10 +3333,7 @@ function createNodeContextMenuHandlers(nodeId, wb, runner, registry, outputsMap,
                 dry: true,
             });
             // Select the newly duplicated node
-            wb.setSelection({
-                nodes: [newNodeId],
-                edges: [],
-            });
+            wb.setSelection({ nodes: [newNodeId], edges: [] }, { commit: true, reason: "duplicate" });
             onClose();
         },
         onDuplicateWithEdges: async () => {
@@ -3335,10 +3366,9 @@ function createNodeContextMenuHandlers(nodeId, wb, runner, registry, outputsMap,
                 }, { dry: true });
             }
             // Select the newly duplicated node and edges
-            wb.setSelection({
-                nodes: [newNodeId],
-                edges: [],
-            });
+            if (newNodeId) {
+                wb.setSelection({ nodes: [newNodeId], edges: [] }, { commit: true, reason: "duplicate-with-edges" });
+            }
             onClose();
         },
         onRunPull: async () => {
@@ -3412,7 +3442,7 @@ function createSelectionContextMenuHandlers(wb, onClose, getDefaultNodeSize, onC
                 onClose();
             },
         onDelete: () => {
-            wb.deleteSelection();
+            wb.deleteSelection({ commit: true, reason: "delete-selection" });
             onClose();
         },
         onClose,
@@ -4094,10 +4124,14 @@ function DefaultContextMenu({ open, clientPos, handlers, registry, nodeIds, enab
         }, children: [hasPasteData && handlers.onPaste && (jsxs("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100 disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-between", onClick: handlePaste, children: [jsx("span", { children: "Paste" }), enableKeyboardShortcuts && keyboardShortcuts.paste && (jsx("span", { className: "text-gray-400 text-xs ml-4", children: formatShortcut(keyboardShortcuts.paste) }))] })), (handlers.onUndo || handlers.onRedo) && (jsxs(Fragment, { children: [hasPasteData && handlers.onPaste && (jsx("div", { className: "h-px bg-gray-200 my-1" })), handlers.onUndo && (jsxs("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100 disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-between", onClick: handlers.onUndo, disabled: !canUndo, children: [jsx("span", { children: "Undo" }), enableKeyboardShortcuts && keyboardShortcuts.undo && (jsx("span", { className: "text-gray-400 text-xs ml-4", children: formatShortcut(keyboardShortcuts.undo) }))] })), handlers.onRedo && (jsxs("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100 disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-between", onClick: handlers.onRedo, disabled: !canRedo, children: [jsx("span", { children: "Redo" }), enableKeyboardShortcuts && keyboardShortcuts.redo && (jsx("span", { className: "text-gray-400 text-xs ml-4", children: formatShortcut(keyboardShortcuts.redo) }))] }))] })), hasPasteData &&
                 handlers.onPaste &&
                 !handlers.onUndo &&
-                !handlers.onRedo && jsx("div", { className: "h-px bg-gray-200 my-1" }), jsxs("div", { className: "px-2 py-1 font-semibold text-gray-700", children: ["Add Node", " ", jsxs("span", { className: "text-gray-500 font-normal", children: ["(", totalCount, ")"] })] }), jsx("div", { className: "px-2 pb-1", children: jsx("input", { ref: inputRef, type: "text", value: query, onChange: (e) => setQuery(e.target.value), placeholder: "Filter nodes...", className: "w-full border border-gray-300 px-2 py-1 text-sm outline-none focus:border-gray-400 select-text", onClick: (e) => e.stopPropagation(), onMouseDown: (e) => e.stopPropagation(), onWheel: (e) => e.stopPropagation() }) }), jsx("div", { className: "max-h-60 overflow-auto", children: totalCount > 0 ? (renderTree(root)) : (jsx("div", { className: "px-3 py-2 text-gray-400", children: "No matches" })) })] }));
+                !handlers.onRedo && jsx("div", { className: "h-px bg-gray-200 my-1" }), jsxs("div", { className: "px-2 py-1 font-semibold text-gray-700", children: ["Add Node", " ", jsxs("span", { className: "text-gray-500 font-normal", children: ["(", totalCount, ")"] })] }), jsx("div", { className: "px-2 pb-1", children: jsx("input", { ref: inputRef, type: "text", value: query, onChange: (e) => setQuery(e.target.value), placeholder: "Filter nodes...", className: "w-full border border-gray-300 rounded px-2 py-1 text-sm outline-none focus:border-gray-400 select-text", onClick: (e) => e.stopPropagation(), onMouseDown: (e) => e.stopPropagation(), onWheel: (e) => e.stopPropagation() }) }), jsx("div", { className: "max-h-60 overflow-auto", children: totalCount > 0 ? (renderTree(root)) : (jsx("div", { className: "px-3 py-2 text-gray-400", children: "No matches" })) })] }));
 }
 
-function NodeContextMenu({ open, clientPos, nodeId, handlers, canRunPull, bakeableOutputs, }) {
+function NodeContextMenu({ open, clientPos, nodeId, handlers, canRunPull, bakeableOutputs, enableKeyboardShortcuts = true, keyboardShortcuts = {
+    copy: "⌘/Ctrl + C",
+    duplicate: "⌘/Ctrl + D",
+    delete: "Delete",
+}, }) {
     const ref = useRef(null);
     // outside click + ESC
     useEffect(() => {
@@ -4124,6 +4158,12 @@ function NodeContextMenu({ open, clientPos, nodeId, handlers, canRunPull, bakeab
         if (open)
             ref.current?.focus();
     }, [open]);
+    // Helper to format shortcut for current platform
+    const formatShortcut = (shortcut) => {
+        const isMac = typeof navigator !== "undefined" &&
+            navigator.userAgent.toLowerCase().includes("mac");
+        return shortcut.replace(/⌘\/Ctrl/g, isMac ? "⌘" : "Ctrl");
+    };
     if (!open || !clientPos || !nodeId)
         return null;
     // clamp
@@ -4135,7 +4175,7 @@ function NodeContextMenu({ open, clientPos, nodeId, handlers, canRunPull, bakeab
     return (jsxs("div", { ref: ref, tabIndex: -1, className: "fixed z-[1000] bg-white border border-gray-300 rounded-lg shadow-lg p-1 min-w-[180px] text-sm text-gray-700 select-none", style: { left: x, top: y }, onClick: (e) => e.stopPropagation(), onMouseDown: (e) => e.stopPropagation(), onWheel: (e) => e.stopPropagation(), onContextMenu: (e) => {
             e.preventDefault();
             e.stopPropagation();
-        }, children: [jsxs("div", { className: "px-2 py-1 font-semibold text-gray-700", children: ["Node (", nodeId, ")"] }), jsx("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100", onClick: handlers.onDelete, children: "Delete" }), jsx("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100", onClick: handlers.onDuplicate, children: "Duplicate" }), jsx("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100", onClick: handlers.onDuplicateWithEdges, children: "Duplicate with edges" }), canRunPull && (jsx("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100", onClick: handlers.onRunPull, children: "Run (pull)" })), jsx("div", { className: "h-px bg-gray-200 my-1" }), jsx("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100", onClick: handlers.onCopy, children: "Copy" }), jsx("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100", onClick: handlers.onCopyId, children: "Copy Node ID" }), bakeableOutputs.length > 0 && (jsxs(Fragment, { children: [jsx("div", { className: "h-px bg-gray-200 my-1" }), jsx("div", { className: "px-2 py-1 font-semibold text-gray-700", children: "Bake" }), bakeableOutputs.map((h) => (jsxs("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100", onClick: () => handlers.onBake(h), children: ["Bake: ", h] }, h)))] }))] }));
+        }, children: [jsxs("div", { className: "px-2 py-1 font-semibold text-gray-700", children: ["Node (", nodeId, ")"] }), jsxs("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100 flex items-center justify-between", onClick: handlers.onDelete, children: [jsx("span", { children: "Delete" }), enableKeyboardShortcuts && keyboardShortcuts.delete && (jsx("span", { className: "text-gray-400 text-xs ml-4", children: formatShortcut(keyboardShortcuts.delete) }))] }), jsxs("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100 flex items-center justify-between", onClick: handlers.onDuplicate, children: [jsx("span", { children: "Duplicate" }), enableKeyboardShortcuts && keyboardShortcuts.duplicate && (jsx("span", { className: "text-gray-400 text-xs ml-4", children: formatShortcut(keyboardShortcuts.duplicate) }))] }), jsx("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100", onClick: handlers.onDuplicateWithEdges, children: "Duplicate with edges" }), canRunPull && (jsx("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100", onClick: handlers.onRunPull, children: "Run (pull)" })), jsx("div", { className: "h-px bg-gray-200 my-1" }), jsxs("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100 flex items-center justify-between", onClick: handlers.onCopy, children: [jsx("span", { children: "Copy" }), enableKeyboardShortcuts && keyboardShortcuts.copy && (jsx("span", { className: "text-gray-400 text-xs ml-4", children: formatShortcut(keyboardShortcuts.copy) }))] }), jsx("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100", onClick: handlers.onCopyId, children: "Copy Node ID" }), bakeableOutputs.length > 0 && (jsxs(Fragment, { children: [jsx("div", { className: "h-px bg-gray-200 my-1" }), jsx("div", { className: "px-2 py-1 font-semibold text-gray-700", children: "Bake" }), bakeableOutputs.map((h) => (jsxs("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100", onClick: () => handlers.onBake(h), children: ["Bake: ", h] }, h)))] }))] }));
 }
 
 function SelectionContextMenu({ open, clientPos, handlers, enableKeyboardShortcuts = true, keyboardShortcuts = {
@@ -4523,7 +4563,7 @@ const WorkbenchCanvas = React.forwardRef(({ showValues, toString, toElement, get
         setNodeMenuOpen(false);
         setSelectionMenuOpen(false);
     };
-    const addNodeAt = useCallback(async (typeId, opts) => wb.addNode({ typeId, position: opts.position }, { inputs: opts.inputs }), [wb]);
+    const addNodeAt = useCallback(async (typeId, opts) => wb.addNode({ typeId, position: opts.position }, { inputs: opts.inputs, commit: true }), [wb]);
     const onCloseMenu = useCallback(() => {
         setMenuOpen(false);
     }, []);
@@ -4555,7 +4595,7 @@ const WorkbenchCanvas = React.forwardRef(({ showValues, toString, toElement, get
             const data = storage.get();
             if (!data)
                 return;
-            wb.pasteCopiedData(data, position);
+            wb.pasteCopiedData(data, position, { commit: true, reason: "paste" });
             onCloseMenu();
         }, runner, () => storage.get(), () => storage.set(null));
         if (overrides?.getDefaultContextMenuHandlers) {
@@ -4576,9 +4616,7 @@ const WorkbenchCanvas = React.forwardRef(({ showValues, toString, toElement, get
         }, runner);
         if (overrides?.getSelectionContextMenuHandlers) {
             const selection = wb.getSelection();
-            return overrides.getSelectionContextMenuHandlers(wb, selection, baseHandlers, {
-                getDefaultNodeSize: overrides.getDefaultNodeSize,
-            });
+            return overrides.getSelectionContextMenuHandlers(wb, selection, baseHandlers, { getDefaultNodeSize: overrides.getDefaultNodeSize });
         }
         return baseHandlers;
     }, [wb, runner, overrides, onCloseSelectionMenu]);
@@ -4624,6 +4662,7 @@ const WorkbenchCanvas = React.forwardRef(({ showValues, toString, toElement, get
         redo: "⌘/Ctrl + Shift + Z",
         copy: "⌘/Ctrl + C",
         paste: "⌘/Ctrl + V",
+        duplicate: "⌘/Ctrl + D",
         delete: "Delete",
     };
     // Keyboard shortcut handler
@@ -4674,12 +4713,26 @@ const WorkbenchCanvas = React.forwardRef(({ showValues, toString, toElement, get
                 const selection = wb.getSelection();
                 if (selection.nodes.length > 0 || selection.edges.length > 0) {
                     e.preventDefault();
-                    if (selectionContextMenuHandlers.onCopy) {
+                    // If single node selected, use node context menu handler; otherwise use selection handler
+                    if (selection.nodes.length === 1 && nodeContextMenuHandlers?.onCopy) {
+                        nodeContextMenuHandlers.onCopy();
+                    }
+                    else if (selectionContextMenuHandlers.onCopy) {
                         selectionContextMenuHandlers.onCopy();
                     }
                 }
                 return;
             }
+            // Duplicate: Cmd/Ctrl + D
+            if (modKey && key === "d" && !e.shiftKey && !e.altKey) {
+                const selection = wb.getSelection();
+                if (selection.nodes.length === 1 &&
+                    nodeContextMenuHandlers?.onDuplicate) {
+                    e.preventDefault();
+                    nodeContextMenuHandlers.onDuplicate();
+                }
+                return;
+            }
             // Paste: Cmd/Ctrl + V
             if (modKey && key === "v" && !e.shiftKey && !e.altKey) {
                 e.preventDefault();
@@ -4709,6 +4762,7 @@ const WorkbenchCanvas = React.forwardRef(({ showValues, toString, toElement, get
         runner,
         defaultContextMenuHandlers,
         selectionContextMenuHandlers,
+        nodeContextMenuHandlers,
         rfInstanceRef,
     ]);
     // Get custom renderers from UI extension registry (reactive to uiVersion changes)
@@ -4725,7 +4779,7 @@ const WorkbenchCanvas = React.forwardRef(({ showValues, toString, toElement, get
     const onMoveEnd = useCallback(() => {
         if (rfInstanceRef.current) {
             const viewport = rfInstanceRef.current.getViewport();
-            wb.setViewport({ x: viewport.x, y: viewport.y, zoom: viewport.zoom }, { commit: true });
+            wb.setViewport({ x: viewport.x, y: viewport.y, zoom: viewport.zoom });
         }
     }, [wb]);
     const viewportRef = useRef(null);
@@ -4761,7 +4815,9 @@ const WorkbenchCanvas = React.forwardRef(({ showValues, toString, toElement, get
                             ? { enableKeyboardShortcuts, keyboardShortcuts }
                             : {}) })) : (jsx(DefaultContextMenu, { open: menuOpen, clientPos: menuPos, handlers: defaultContextMenuHandlers, registry: registry, nodeIds: nodeIds, enableKeyboardShortcuts: enableKeyboardShortcuts, keyboardShortcuts: keyboardShortcuts })), !!nodeAtMenu &&
                         nodeContextMenuHandlers &&
-                        (NodeContextMenuRenderer ? (jsx(NodeContextMenuRenderer, { open: nodeMenuOpen, clientPos: nodeMenuPos, nodeId: nodeAtMenu, handlers: nodeContextMenuHandlers, canRunPull: canRunPull, bakeableOutputs: bakeableOutputs })) : (jsx(NodeContextMenu, { open: nodeMenuOpen, clientPos: nodeMenuPos, nodeId: nodeAtMenu, handlers: nodeContextMenuHandlers, canRunPull: canRunPull, bakeableOutputs: bakeableOutputs }))), selectionMenuOpen && selectionMenuPos && (jsx(SelectionContextMenu, { open: selectionMenuOpen, clientPos: selectionMenuPos, handlers: selectionContextMenuHandlers, enableKeyboardShortcuts: enableKeyboardShortcuts, keyboardShortcuts: keyboardShortcuts }))] }) }) }));
+                        (NodeContextMenuRenderer ? (jsx(NodeContextMenuRenderer, { open: nodeMenuOpen, clientPos: nodeMenuPos, nodeId: nodeAtMenu, handlers: nodeContextMenuHandlers, canRunPull: canRunPull, bakeableOutputs: bakeableOutputs, ...(enableKeyboardShortcuts !== false
+                                ? { enableKeyboardShortcuts, keyboardShortcuts }
+                                : {}) })) : (jsx(NodeContextMenu, { open: nodeMenuOpen, clientPos: nodeMenuPos, nodeId: nodeAtMenu, handlers: nodeContextMenuHandlers, canRunPull: canRunPull, bakeableOutputs: bakeableOutputs, enableKeyboardShortcuts: enableKeyboardShortcuts, keyboardShortcuts: keyboardShortcuts }))), selectionMenuOpen && selectionMenuPos && (jsx(SelectionContextMenu, { open: selectionMenuOpen, clientPos: selectionMenuPos, handlers: selectionContextMenuHandlers, enableKeyboardShortcuts: enableKeyboardShortcuts, keyboardShortcuts: keyboardShortcuts }))] }) }) }));
 });
 
 function WorkbenchStudioCanvas({ setRegistry, autoScroll, onAutoScrollChange, example, onExampleChange, engine, onEngineChange, backendKind, onBackendKindChange, httpBaseUrl, onHttpBaseUrlChange, wsUrl, onWsUrlChange, debug, onDebugChange, showValues, onShowValuesChange, hideWorkbench, onHideWorkbenchChange, overrides, onInit, onChange, }) {