@bian-womp/spark-workbench 0.2.67 → 0.2.69

package/lib/cjs/index.cjs

@@ -627,11 +627,10 @@ class AbstractGraphRunner {
         this.runtime.resume();
         // Create and launch new engine (to be implemented by subclasses)
         await this.createAndLaunchEngine(opts);
-        // Re-apply staged inputs to new engine
+        // Re-apply staged inputs to new engine using runner's setInputs method
+        // This ensures consistency and proper handling of staged inputs
         for (const [nodeId, map] of Object.entries(currentInputs)) {
-            if (this.engine) {
-                this.engine.setInputs(nodeId, map);
-            }
+            await this.setInputs(nodeId, map);
         }
     }
     getInputDefaults(def) {
@@ -673,6 +672,21 @@ class AbstractGraphRunner {
     getRunningEngine() {
         return this.runningKind;
     }
+    // Optional undo/redo support
+    async undo() {
+        return false;
+    }
+    async redo() {
+        return false;
+    }
+    async canUndo() {
+        return false;
+    }
+    async canRedo() {
+        return false;
+    }
+    // Optional commit support
+    async commit() { }
 }
 
 // Counter for generating readable runner IDs
@@ -1297,8 +1311,11 @@ class RemoteGraphRunner extends AbstractGraphRunner {
         this.engine = eng;
         this.runningKind = opts?.engine ?? "push";
         this.emit("status", { running: true, engine: this.runningKind });
+        // Re-apply staged inputs using client.setInputs for consistency
         for (const [nodeId, map] of Object.entries(this.stagedInputs)) {
-            this.engine.setInputs(nodeId, map);
+            await client.setInputs(nodeId, map).catch(() => {
+                // Ignore errors during launch - inputs will be set when user calls setInputs
+            });
         }
     }
     /**
@@ -1340,9 +1357,11 @@ class RemoteGraphRunner extends AbstractGraphRunner {
         this.engine = eng;
         this.runningKind = opts?.engine ?? "push";
         this.emit("status", { running: true, engine: this.runningKind });
-        // Re-apply staged inputs to new engine
+        // Re-apply staged inputs using client.setInputs for consistency
         for (const [nodeId, map] of Object.entries(currentInputs)) {
-            this.engine.setInputs(nodeId, map);
+            await client.setInputs(nodeId, map).catch(() => {
+                // Ignore errors during engine switch - inputs will be set when user calls setInputs
+            });
         }
     }
     async step() {
@@ -1357,7 +1376,7 @@ class RemoteGraphRunner extends AbstractGraphRunner {
         const client = await this.ensureClient();
         await client.flush();
     }
-    setInputs(nodeId, inputs, options) {
+    async setInputs(nodeId, inputs, options) {
         // Update staged inputs (for getInputs to work correctly)
         if (!this.stagedInputs[nodeId])
             this.stagedInputs[nodeId] = {};
@@ -1369,21 +1388,17 @@ class RemoteGraphRunner extends AbstractGraphRunner {
                 this.stagedInputs[nodeId][handle] = value;
             }
         }
-        // If engine exists, call directly; otherwise ensure client (fire-and-forget)
-        if (this.engine) {
-            this.engine.setInputs(nodeId, inputs, options);
+        // Use transport.request instead of transport.send for consistency
+        const client = await this.ensureClient();
+        try {
+            await client.setInputs(nodeId, inputs, options);
         }
-        else {
-            this.ensureClient()
-                .then((client) => {
-                client.getEngine().setInputs(nodeId, inputs, options);
-            })
-                .catch(() => {
-                // Emit synthetic events if connection fails
-                for (const [handle, value] of Object.entries(inputs)) {
-                    this.emit("value", { nodeId, handle, value, io: "input" });
-                }
-            });
+        catch (err) {
+            // Emit synthetic events if connection fails
+            for (const [handle, value] of Object.entries(inputs)) {
+                this.emit("value", { nodeId, handle, value, io: "input" });
+            }
+            throw err;
         }
     }
     async copyOutputs(fromNodeId, toNodeId, options) {
@@ -1418,6 +1433,52 @@ class RemoteGraphRunner extends AbstractGraphRunner {
         const client = await this.ensureClient();
         await client.setExtData(data);
     }
+    async commit() {
+        const client = await this.ensureClient();
+        try {
+            await client.commit();
+        }
+        catch (err) {
+            console.error("[RemoteGraphRunner] Error committing:", err);
+            throw err;
+        }
+    }
+    async undo() {
+        const client = await this.ensureClient();
+        try {
+            return await client.undo();
+        }
+        catch {
+            return false;
+        }
+    }
+    async redo() {
+        const client = await this.ensureClient();
+        try {
+            return await client.redo();
+        }
+        catch {
+            return false;
+        }
+    }
+    async canUndo() {
+        const client = await this.ensureClient();
+        try {
+            return await client.canUndo();
+        }
+        catch {
+            return false;
+        }
+    }
+    async canRedo() {
+        const client = await this.ensureClient();
+        try {
+            return await client.canRedo();
+        }
+        catch {
+            return false;
+        }
+    }
     async snapshotFull() {
         const client = await this.ensureClient();
         try {
@@ -2870,7 +2931,7 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
             }
             return add("workbench", "graphChanged")(event);
         });
-        const offWbGraphUiChanged = wb.on("graphUiChanged", add("workbench", "graphUiChanged"));
+        const offWbGraphUiChangedForLog = wb.on("graphUiChanged", add("workbench", "graphUiChanged"));
         const offWbValidationChanged = wb.on("validationChanged", add("workbench", "validationChanged"));
         // Ensure newly added nodes start as invalidated until first evaluation
         const offWbAddNode = wb.on("graphChanged", (e) => {
@@ -2884,39 +2945,60 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
             }
         });
         const offWbGraphChangedForUpdate = wb.on("graphChanged", async (event) => {
-            if (!runner.isRunning())
+            if (!runner.isRunning()) {
+                // If runner not running, commit immediately (no update needed)
+                await runner.commit().catch((err) => {
+                    console.error("[WorkbenchContext] Error committing:", err);
+                });
                 return;
+            }
             try {
                 if (event.change?.type === "addNode") {
                     const { nodeId, inputs, copyOutputsFrom } = event.change;
                     if (event.dry) {
                         await runner.update(event.def, { dry: true });
                         if (inputs) {
-                            runner.setInputs(nodeId, inputs, { dry: true });
+                            await runner.setInputs(nodeId, inputs, { dry: true });
                         }
                         if (copyOutputsFrom) {
-                            runner.copyOutputs(copyOutputsFrom, nodeId, { dry: true });
+                            await runner.copyOutputs(copyOutputsFrom, nodeId, { dry: true });
                         }
                     }
                     else {
                         await runner.update(event.def, { dry: !!inputs });
                         if (inputs) {
-                            runner.setInputs(nodeId, inputs, { dry: false });
+                            await runner.setInputs(nodeId, inputs, { dry: false });
                         }
                     }
                 }
                 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);
+                });
             }
             catch (err) {
                 console.error("[WorkbenchContext] Error updating graph:", err);
             }
         });
         const offWbdSetValidation = wb.on("validationChanged", (r) => setValidation(r));
-        const offWbSelectionChanged = wb.on("selectionChanged", (sel) => {
+        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);
+            });
+        });
+        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) => {
+                    console.error("[WorkbenchContext] Error committing UI changes:", err);
+                });
+            }
         });
         const offWbError = wb.on("error", add("workbench", "error"));
         // Registry updates: swap registry and refresh graph validation/UI
@@ -2953,6 +3035,7 @@ function WorkbenchProvider({ wb, runner, registry, setRegistry, overrides, uiVer
             offRunnerInvalidate();
             offRunnerStats();
             offWbGraphChanged();
+            offWbGraphUiChangedForLog();
             offWbGraphUiChanged();
             offWbValidationChanged();
             offWbError();
@@ -3340,10 +3423,24 @@ function createSelectionContextMenuHandlers(wb, onClose, getDefaultNodeSize, onC
 /**
  * Creates base default context menu handlers.
  */
-function createDefaultContextMenuHandlers(onAddNode, onClose, onPaste) {
+function createDefaultContextMenuHandlers(onAddNode, onClose, onPaste, runner, getCopiedData, clearCopiedData) {
+    // Wrap paste handler to clear storage after paste
+    const wrappedOnPaste = onPaste && getCopiedData && clearCopiedData
+        ? (position) => {
+            onPaste(position);
+            clearCopiedData();
+        }
+        : onPaste;
+    // Function to check if paste data exists (called dynamically when menu opens)
+    const hasPasteData = getCopiedData ? () => !!getCopiedData() : undefined;
     return {
         onAddNode,
-        onPaste,
+        onPaste: wrappedOnPaste,
+        hasPasteData,
+        onUndo: runner ? () => runner.undo().then(() => onClose()) : undefined,
+        onRedo: runner ? () => runner.redo().then(() => onClose()) : undefined,
+        canUndo: runner ? () => runner.canUndo().catch(() => false) : undefined,
+        canRedo: runner ? () => runner.canRedo().catch(() => false) : undefined,
         onClose,
     };
 }
@@ -3867,13 +3964,48 @@ function DefaultNodeContent({ data, isConnectable, }) {
                 } })] }));
 }
 
-function DefaultContextMenu({ open, clientPos, handlers, registry, nodeIds, }) {
+function DefaultContextMenu({ open, clientPos, handlers, registry, nodeIds, enableKeyboardShortcuts = true, keyboardShortcuts = {
+    undo: "⌘/Ctrl + Z",
+    redo: "⌘/Ctrl + Shift + Z",
+    paste: "⌘/Ctrl + V",
+}, }) {
     const rf = react.useReactFlow();
     const [query, setQuery] = React.useState("");
+    const [canUndo, setCanUndo] = React.useState(false);
+    const [canRedo, setCanRedo] = React.useState(false);
+    const [hasPasteData, setHasPasteData] = React.useState(false);
     const q = query.trim().toLowerCase();
     const filteredIds = q
         ? nodeIds.filter((id) => id.toLowerCase().includes(q))
         : nodeIds;
+    // Check undo/redo availability and paste data when menu opens
+    React.useEffect(() => {
+        if (!open)
+            return;
+        let cancelled = false;
+        const checkAvailability = async () => {
+            if (handlers.canUndo) {
+                const result = await handlers.canUndo();
+                if (!cancelled)
+                    setCanUndo(result);
+            }
+            if (handlers.canRedo) {
+                const result = await handlers.canRedo();
+                if (!cancelled)
+                    setCanRedo(result);
+            }
+            // Check paste data dynamically
+            if (handlers.hasPasteData) {
+                const result = handlers.hasPasteData();
+                if (!cancelled)
+                    setHasPasteData(result);
+            }
+        };
+        checkAvailability();
+        return () => {
+            cancelled = true;
+        };
+    }, [open, handlers.canUndo, handlers.canRedo, handlers.hasPasteData]);
     const root = { __children: {} };
     for (const id of filteredIds) {
         const parts = id.split(".");
@@ -3938,6 +4070,12 @@ function DefaultContextMenu({ open, clientPos, handlers, registry, nodeIds, }) {
         handlers.onPaste(p);
         handlers.onClose();
     };
+    // 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");
+    };
     const renderTree = (tree, path = []) => {
         const entries = Object.entries(tree?.__children ?? {}).sort((a, b) => a[0].localeCompare(b[0]));
         return (jsxRuntime.jsx("div", { children: entries.map(([key, child]) => {
@@ -3955,7 +4093,10 @@ function DefaultContextMenu({ open, clientPos, handlers, registry, nodeIds, }) {
     return (jsxRuntime.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: [handlers.onPaste && (jsxRuntime.jsx("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100 disabled:opacity-50 disabled:cursor-not-allowed", onClick: handlePaste, children: "Paste" })), handlers.onPaste && jsxRuntime.jsx("div", { className: "h-px bg-gray-200 my-1" }), jsxRuntime.jsxs("div", { className: "px-2 py-1 font-semibold text-gray-700", children: ["Add Node", " ", jsxRuntime.jsxs("span", { className: "text-gray-500 font-normal", children: ["(", totalCount, ")"] })] }), jsxRuntime.jsx("div", { className: "px-2 pb-1", children: jsxRuntime.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() }) }), jsxRuntime.jsx("div", { className: "max-h-60 overflow-auto", children: totalCount > 0 ? (renderTree(root)) : (jsxRuntime.jsx("div", { className: "px-3 py-2 text-gray-400", children: "No matches" })) })] }));
+        }, children: [hasPasteData && handlers.onPaste && (jsxRuntime.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: [jsxRuntime.jsx("span", { children: "Paste" }), enableKeyboardShortcuts && keyboardShortcuts.paste && (jsxRuntime.jsx("span", { className: "text-gray-400 text-xs ml-4", children: formatShortcut(keyboardShortcuts.paste) }))] })), (handlers.onUndo || handlers.onRedo) && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [hasPasteData && handlers.onPaste && (jsxRuntime.jsx("div", { className: "h-px bg-gray-200 my-1" })), handlers.onUndo && (jsxRuntime.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: [jsxRuntime.jsx("span", { children: "Undo" }), enableKeyboardShortcuts && keyboardShortcuts.undo && (jsxRuntime.jsx("span", { className: "text-gray-400 text-xs ml-4", children: formatShortcut(keyboardShortcuts.undo) }))] })), handlers.onRedo && (jsxRuntime.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: [jsxRuntime.jsx("span", { children: "Redo" }), enableKeyboardShortcuts && keyboardShortcuts.redo && (jsxRuntime.jsx("span", { className: "text-gray-400 text-xs ml-4", children: formatShortcut(keyboardShortcuts.redo) }))] }))] })), hasPasteData &&
+                handlers.onPaste &&
+                !handlers.onUndo &&
+                !handlers.onRedo && jsxRuntime.jsx("div", { className: "h-px bg-gray-200 my-1" }), jsxRuntime.jsxs("div", { className: "px-2 py-1 font-semibold text-gray-700", children: ["Add Node", " ", jsxRuntime.jsxs("span", { className: "text-gray-500 font-normal", children: ["(", totalCount, ")"] })] }), jsxRuntime.jsx("div", { className: "px-2 pb-1", children: jsxRuntime.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() }) }), jsxRuntime.jsx("div", { className: "max-h-60 overflow-auto", children: totalCount > 0 ? (renderTree(root)) : (jsxRuntime.jsx("div", { className: "px-3 py-2 text-gray-400", children: "No matches" })) })] }));
 }
 
 function NodeContextMenu({ open, clientPos, nodeId, handlers, canRunPull, bakeableOutputs, }) {
@@ -3999,7 +4140,10 @@ function NodeContextMenu({ open, clientPos, nodeId, handlers, canRunPull, bakeab
         }, children: [jsxRuntime.jsxs("div", { className: "px-2 py-1 font-semibold text-gray-700", children: ["Node (", nodeId, ")"] }), jsxRuntime.jsx("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100", onClick: handlers.onDelete, children: "Delete" }), jsxRuntime.jsx("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100", onClick: handlers.onDuplicate, children: "Duplicate" }), jsxRuntime.jsx("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100", onClick: handlers.onDuplicateWithEdges, children: "Duplicate with edges" }), canRunPull && (jsxRuntime.jsx("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100", onClick: handlers.onRunPull, children: "Run (pull)" })), jsxRuntime.jsx("div", { className: "h-px bg-gray-200 my-1" }), jsxRuntime.jsx("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100", onClick: handlers.onCopy, children: "Copy" }), jsxRuntime.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 && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx("div", { className: "h-px bg-gray-200 my-1" }), jsxRuntime.jsx("div", { className: "px-2 py-1 font-semibold text-gray-700", children: "Bake" }), bakeableOutputs.map((h) => (jsxRuntime.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, }) {
+function SelectionContextMenu({ open, clientPos, handlers, enableKeyboardShortcuts = true, keyboardShortcuts = {
+    copy: "⌘/Ctrl + C",
+    delete: "Delete",
+}, }) {
     const ref = React.useRef(null);
     // Close on outside click and on ESC
     React.useEffect(() => {
@@ -4026,6 +4170,12 @@ function SelectionContextMenu({ open, clientPos, handlers, }) {
         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)
         return null;
     // Clamp menu position to viewport
@@ -4037,7 +4187,7 @@ function SelectionContextMenu({ open, clientPos, handlers, }) {
     return (jsxRuntime.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: [jsxRuntime.jsx("div", { className: "px-2 py-1 font-semibold text-gray-700", children: "Selection" }), jsxRuntime.jsx("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100", onClick: handlers.onCopy, children: "Copy" }), jsxRuntime.jsx("button", { className: "block w-full text-left px-2 py-1 hover:bg-gray-100", onClick: handlers.onDelete, children: "Delete" })] }));
+        }, children: [jsxRuntime.jsx("div", { className: "px-2 py-1 font-semibold text-gray-700", children: "Selection" }), jsxRuntime.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: [jsxRuntime.jsx("span", { children: "Copy" }), enableKeyboardShortcuts && keyboardShortcuts.copy && (jsxRuntime.jsx("span", { className: "text-gray-400 text-xs ml-4", children: formatShortcut(keyboardShortcuts.copy) }))] }), jsxRuntime.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: [jsxRuntime.jsx("span", { children: "Delete" }), enableKeyboardShortcuts && keyboardShortcuts.delete && (jsxRuntime.jsx("span", { className: "text-gray-400 text-xs ml-4", children: formatShortcut(keyboardShortcuts.delete) }))] })] }));
 }
 
 const WorkbenchCanvas = React.forwardRef(({ showValues, toString, toElement, getDefaultNodeSize }, ref) => {
@@ -4409,12 +4559,12 @@ const WorkbenchCanvas = React.forwardRef(({ showValues, toString, toElement, get
                 return;
             wb.pasteCopiedData(data, position);
             onCloseMenu();
-        });
+        }, runner, () => storage.get(), () => storage.set(null));
         if (overrides?.getDefaultContextMenuHandlers) {
             return overrides.getDefaultContextMenuHandlers(wb, baseHandlers);
         }
         return baseHandlers;
-    }, [addNodeAt, onCloseMenu, overrides, wb]);
+    }, [addNodeAt, onCloseMenu, overrides, wb, runner]);
     const selectionContextMenuHandlers = React.useMemo(() => {
         // Get storage from override or use workbench's internal storage
         const storage = overrides?.getCopiedDataStorage
@@ -4469,6 +4619,100 @@ const WorkbenchCanvas = React.forwardRef(({ showValues, toString, toElement, get
             return [];
         return getBakeableOutputs(nodeAtMenu, wb, registry, outputTypesMap);
     }, [nodeAtMenu, wb, registry, outputTypesMap]);
+    // Keyboard shortcuts configuration
+    const enableKeyboardShortcuts = overrides?.enableKeyboardShortcuts !== false; // Default to true
+    const keyboardShortcuts = overrides?.keyboardShortcuts || {
+        undo: "⌘/Ctrl + Z",
+        redo: "⌘/Ctrl + Shift + Z",
+        copy: "⌘/Ctrl + C",
+        paste: "⌘/Ctrl + V",
+        delete: "Delete",
+    };
+    // Keyboard shortcut handler
+    React.useEffect(() => {
+        if (!enableKeyboardShortcuts)
+            return;
+        const handleKeyDown = async (e) => {
+            // Ignore if typing in input/textarea
+            const target = e.target;
+            if (target.tagName === "INPUT" ||
+                target.tagName === "TEXTAREA" ||
+                target.isContentEditable) {
+                return;
+            }
+            // Detect Mac platform using userAgent (navigator.platform is deprecated)
+            const isMac = typeof navigator !== "undefined" &&
+                navigator.userAgent.toLowerCase().includes("mac");
+            const modKey = isMac ? e.metaKey : e.ctrlKey;
+            const key = e.key.toLowerCase();
+            // Undo: Cmd/Ctrl + Z
+            if (modKey && key === "z" && !e.shiftKey && !e.altKey) {
+                e.preventDefault();
+                if (runner &&
+                    "onUndo" in defaultContextMenuHandlers &&
+                    defaultContextMenuHandlers.onUndo) {
+                    const canUndo = await runner.canUndo().catch(() => false);
+                    if (canUndo) {
+                        defaultContextMenuHandlers.onUndo();
+                    }
+                }
+                return;
+            }
+            // Redo: Cmd/Ctrl + Shift + Z
+            if (modKey && e.shiftKey && key === "z" && !e.altKey) {
+                e.preventDefault();
+                if (runner &&
+                    "onRedo" in defaultContextMenuHandlers &&
+                    defaultContextMenuHandlers.onRedo) {
+                    const canRedo = await runner.canRedo().catch(() => false);
+                    if (canRedo) {
+                        defaultContextMenuHandlers.onRedo();
+                    }
+                }
+                return;
+            }
+            // Copy: Cmd/Ctrl + C
+            if (modKey && key === "c" && !e.shiftKey && !e.altKey) {
+                const selection = wb.getSelection();
+                if (selection.nodes.length > 0 || selection.edges.length > 0) {
+                    e.preventDefault();
+                    if (selectionContextMenuHandlers.onCopy) {
+                        selectionContextMenuHandlers.onCopy();
+                    }
+                }
+                return;
+            }
+            // Paste: Cmd/Ctrl + V
+            if (modKey && key === "v" && !e.shiftKey && !e.altKey) {
+                e.preventDefault();
+                if ("hasPasteData" in defaultContextMenuHandlers &&
+                    defaultContextMenuHandlers.hasPasteData &&
+                    defaultContextMenuHandlers.hasPasteData() &&
+                    "onPaste" in defaultContextMenuHandlers &&
+                    defaultContextMenuHandlers.onPaste) {
+                    const center = rfInstanceRef.current?.screenToFlowPosition({
+                        x: window.innerWidth / 2,
+                        y: window.innerHeight / 2,
+                    }) || { x: 0, y: 0 };
+                    defaultContextMenuHandlers.onPaste(center);
+                }
+                return;
+            }
+            // Note: Delete/Backspace is handled by ReactFlow's deleteKeyCode prop
+            // which triggers onNodesDelete/onEdgesDelete, so we don't need to handle it here
+        };
+        window.addEventListener("keydown", handleKeyDown);
+        return () => {
+            window.removeEventListener("keydown", handleKeyDown);
+        };
+    }, [
+        enableKeyboardShortcuts,
+        wb,
+        runner,
+        defaultContextMenuHandlers,
+        selectionContextMenuHandlers,
+        rfInstanceRef,
+    ]);
     // Get custom renderers from UI extension registry (reactive to uiVersion changes)
     const { BackgroundRenderer, MinimapRenderer, ControlsRenderer, DefaultContextMenuRenderer, NodeContextMenuRenderer, connectionLineRenderer, } = React.useMemo(() => {
         return {
@@ -4515,9 +4759,11 @@ const WorkbenchCanvas = React.forwardRef(({ showValues, toString, toElement, get
                             zoom: savedViewport.zoom,
                         });
                     }
-                }, onConnect: onConnect, onEdgesChange: onEdgesChange, onEdgesDelete: onEdgesDelete, onNodesDelete: onNodesDelete, onNodesChange: onNodesChange, onMoveEnd: onMoveEnd, deleteKeyCode: ["Backspace", "Delete"], proOptions: { hideAttribution: true }, noDragClassName: "wb-nodrag", noWheelClassName: "wb-nowheel", noPanClassName: "wb-nopan", fitView: true, children: [BackgroundRenderer ? (jsxRuntime.jsx(BackgroundRenderer, {})) : (jsxRuntime.jsx(react.Background, { id: "workbench-canvas-background", variant: react.BackgroundVariant.Dots, gap: 12, size: 1 })), MinimapRenderer ? jsxRuntime.jsx(MinimapRenderer, {}) : jsxRuntime.jsx(react.MiniMap, {}), ControlsRenderer ? jsxRuntime.jsx(ControlsRenderer, {}) : jsxRuntime.jsx(react.Controls, {}), DefaultContextMenuRenderer ? (jsxRuntime.jsx(DefaultContextMenuRenderer, { open: menuOpen, clientPos: menuPos, handlers: defaultContextMenuHandlers, registry: registry, nodeIds: nodeIds })) : (jsxRuntime.jsx(DefaultContextMenu, { open: menuOpen, clientPos: menuPos, handlers: defaultContextMenuHandlers, registry: registry, nodeIds: nodeIds })), !!nodeAtMenu &&
+                }, onConnect: onConnect, onEdgesChange: onEdgesChange, onEdgesDelete: onEdgesDelete, onNodesDelete: onNodesDelete, onNodesChange: onNodesChange, onMoveEnd: onMoveEnd, deleteKeyCode: ["Backspace", "Delete"], proOptions: { hideAttribution: true }, noDragClassName: "wb-nodrag", noWheelClassName: "wb-nowheel", noPanClassName: "wb-nopan", fitView: true, children: [BackgroundRenderer ? (jsxRuntime.jsx(BackgroundRenderer, {})) : (jsxRuntime.jsx(react.Background, { id: "workbench-canvas-background", variant: react.BackgroundVariant.Dots, gap: 12, size: 1 })), MinimapRenderer ? jsxRuntime.jsx(MinimapRenderer, {}) : jsxRuntime.jsx(react.MiniMap, {}), ControlsRenderer ? jsxRuntime.jsx(ControlsRenderer, {}) : jsxRuntime.jsx(react.Controls, {}), DefaultContextMenuRenderer ? (jsxRuntime.jsx(DefaultContextMenuRenderer, { open: menuOpen, clientPos: menuPos, handlers: defaultContextMenuHandlers, registry: registry, nodeIds: nodeIds, ...(enableKeyboardShortcuts !== false
+                            ? { enableKeyboardShortcuts, keyboardShortcuts }
+                            : {}) })) : (jsxRuntime.jsx(DefaultContextMenu, { open: menuOpen, clientPos: menuPos, handlers: defaultContextMenuHandlers, registry: registry, nodeIds: nodeIds, enableKeyboardShortcuts: enableKeyboardShortcuts, keyboardShortcuts: keyboardShortcuts })), !!nodeAtMenu &&
                         nodeContextMenuHandlers &&
-                        (NodeContextMenuRenderer ? (jsxRuntime.jsx(NodeContextMenuRenderer, { open: nodeMenuOpen, clientPos: nodeMenuPos, nodeId: nodeAtMenu, handlers: nodeContextMenuHandlers, canRunPull: canRunPull, bakeableOutputs: bakeableOutputs })) : (jsxRuntime.jsx(NodeContextMenu, { open: nodeMenuOpen, clientPos: nodeMenuPos, nodeId: nodeAtMenu, handlers: nodeContextMenuHandlers, canRunPull: canRunPull, bakeableOutputs: bakeableOutputs }))), selectionMenuOpen && selectionMenuPos && (jsxRuntime.jsx(SelectionContextMenu, { open: selectionMenuOpen, clientPos: selectionMenuPos, handlers: selectionContextMenuHandlers }))] }) }) }));
+                        (NodeContextMenuRenderer ? (jsxRuntime.jsx(NodeContextMenuRenderer, { open: nodeMenuOpen, clientPos: nodeMenuPos, nodeId: nodeAtMenu, handlers: nodeContextMenuHandlers, canRunPull: canRunPull, bakeableOutputs: bakeableOutputs })) : (jsxRuntime.jsx(NodeContextMenu, { open: nodeMenuOpen, clientPos: nodeMenuPos, nodeId: nodeAtMenu, handlers: nodeContextMenuHandlers, canRunPull: canRunPull, bakeableOutputs: bakeableOutputs }))), selectionMenuOpen && selectionMenuPos && (jsxRuntime.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, }) {