Merge remote-tracking branch 'origin/main' into sawka/css

Author: sawka

.github/workflows/copilot-setup-steps.yml

@@ -7,9 +7,9 @@ on:
     pull_request:
         paths: [.github/workflows/copilot-setup-steps.yml]
 
-env:
-    GO_VERSION: "1.25.6"
-    NODE_VERSION: 22
+# Note: global env vars are NOT used here — they are not reliable in all
+# GitHub Actions contexts (e.g. Copilot setup steps). Values are inlined
+# directly into each step that needs them.
 
 jobs:
     copilot-setup-steps:
@@ -23,12 +23,12 @@ jobs:
             # Go + Node versions match your helper
             - uses: actions/setup-go@v6
               with:
-                  go-version: ${{ env.GO_VERSION }}
+                  go-version: "1.25.6"
                   cache-dependency-path: go.sum
 
             - uses: actions/setup-node@v6
               with:
-                  node-version: ${{ env.NODE_VERSION }}
+                  node-version: 22
                   cache: npm
                   cache-dependency-path: package-lock.json
 

.kilocode/skills/context-menu/SKILL.md

@@ -40,7 +40,7 @@ import { ContextMenuModel } from "@/app/store/contextmenu";
 To display the context menu, call:
 
 ```ts
-ContextMenuModel.showContextMenu(menu, event);
+ContextMenuModel.getInstance().showContextMenu(menu, event);
 ```
 
 - **menu**: An array of `ContextMenuItem`.
@@ -75,7 +75,7 @@ const menu: ContextMenuItem[] = [
   },
 ];
 
-ContextMenuModel.showContextMenu(menu, e);
+ContextMenuModel.getInstance().showContextMenu(menu, e);
 ```
 
 ---
@@ -111,7 +111,7 @@ const menu: ContextMenuItem[] = [
   },
 ];
 
-ContextMenuModel.showContextMenu(menu, e);
+ContextMenuModel.getInstance().showContextMenu(menu, e);
 ```
 
 ---
@@ -143,7 +143,7 @@ Open a configuration file (e.g., `widgets.json`) in preview mode:
 - **Actions**: Use `click` for actions; use `submenu` for nested options.
 - **Separators**: Use `type: "separator"` to group items.
 - **Toggles**: Use `type: "checkbox"` or `"radio"` with the `checked` property.
-- **Displaying**: Use `ContextMenuModel.showContextMenu(menu, event)` to render the menu.
+- **Displaying**: Use `ContextMenuModel.getInstance().showContextMenu(menu, event)` to render the menu.
 
 ## Common Use Cases
 

.roo/rules/rules.md

@@ -93,6 +93,7 @@ The full API is defined in custom.d.ts as type ElectronApi.
 - **CRITICAL** - useAtomValue and useAtom are React HOOKS. They cannot be used inline in JSX code, they must appear at the top of a component in the hooks area of the react code.
 - for simple functions, we prefer `if (!cond) { return }; functionality;` pattern overn `if (cond) { functionality }` because it produces less indentation and is easier to follow.
 - It is now 2026, so if you write new files, or update files use 2026 for the copyright year
+- React.MutableRefObject is deprecated, just use React.RefObject now (current is now always mutable)
 
 ### Strict Comment Rules
 

docs/docs/config.mdx

@@ -69,6 +69,8 @@ wsh editconfig
 | term:allowbracketedpaste             | bool     | allow bracketed paste mode in terminal (default false)                                                                                                                                                                                                        |
 | term:shiftenternewline               | bool     | when enabled, Shift+Enter sends escape sequence + newline (\u001b\n) instead of carriage return, useful for claude code and similar AI coding tools (default false)                                                                                         |
 | term:macoptionismeta                 | bool     | on macOS, treat the Option key as Meta key for terminal keybindings (default false)                                                                                                                                                                          |
+| term:cursor <VersionBadge version="v0.14" />                        | string   | terminal cursor style. valid values are `block` (default), `underline`, and `bar`                                                                                                                                                                            |
+| term:cursorblink <VersionBadge version="v0.14" />                   | bool     | when enabled, terminal cursor blinks (default false)                                                                                                                                                                                                          |
 | term:bellsound <VersionBadge version="v0.14" />                      | bool     | when enabled, plays the system beep sound when the terminal bell (BEL character) is received (default false)                                                                                                                                                  |
 | term:bellindicator <VersionBadge version="v0.14" />                  | bool     | when enabled, shows a visual indicator in the tab when the terminal bell is received (default false)                                                                                                                                                           |
 | term:durable <VersionBadge version="v0.14" />                        | bool     | makes remote terminal sessions durable across network disconnects (defaults to false)                                                                                                                                                                           |
@@ -145,6 +147,8 @@ For reference, this is the current default configuration (v0.14.0):
     "telemetry:enabled": true,
     "term:bellsound": false,
     "term:bellindicator": false,
+    "term:cursor": "block",
+    "term:cursorblink": false,
     "term:copyonselect": true,
     "term:durable": false,
     "waveai:showcloudmodes": true,

emain/emain-menu.ts

@@ -408,27 +408,24 @@ function getWebContentsByWorkspaceOrBuilderId(workspaceOrBuilderId: string): ele
 
 function convertMenuDefArrToMenu(
     webContents: electron.WebContents,
-    menuDefArr: ElectronContextMenuItem[]
+    menuDefArr: ElectronContextMenuItem[],
+    menuState: { hasClick: boolean }
 ): electron.Menu {
     const menuItems: electron.MenuItem[] = [];
     for (const menuDef of menuDefArr) {
         const menuItemTemplate: electron.MenuItemConstructorOptions = {
             role: menuDef.role as any,
             label: menuDef.label,
             type: menuDef.type,
-            click: (_, window) => {
-                const wc = getWindowWebContents(window) ?? webContents;
-                if (!wc) {
-                    console.error("invalid window for context menu click handler:", window);
-                    return;
-                }
-                wc.send("contextmenu-click", menuDef.id);
+            click: () => {
+                menuState.hasClick = true;
+                webContents.send("contextmenu-click", menuDef.id);
             },
             checked: menuDef.checked,
             enabled: menuDef.enabled,
         };
         if (menuDef.submenu != null) {
-            menuItemTemplate.submenu = convertMenuDefArrToMenu(webContents, menuDef.submenu);
+            menuItemTemplate.submenu = convertMenuDefArrToMenu(webContents, menuDef.submenu, menuState);
         }
         const menuItem = new electron.MenuItem(menuItemTemplate);
         menuItems.push(menuItem);
@@ -439,19 +436,27 @@ function convertMenuDefArrToMenu(
 electron.ipcMain.on(
     "contextmenu-show",
     (event, workspaceOrBuilderId: string, menuDefArr: ElectronContextMenuItem[]) => {
+        const webContents = getWebContentsByWorkspaceOrBuilderId(workspaceOrBuilderId);
+        if (!webContents) {
+            console.error("invalid window for context menu:", workspaceOrBuilderId);
+            event.returnValue = true;
+            return;
+        }
         if (menuDefArr.length === 0) {
+            webContents.send("contextmenu-click", null);
             event.returnValue = true;
             return;
         }
         fireAndForget(async () => {
-            const webContents = getWebContentsByWorkspaceOrBuilderId(workspaceOrBuilderId);
-            if (!webContents) {
-                console.error("invalid window for context menu:", workspaceOrBuilderId);
-                return;
-            }
-
-            const menu = convertMenuDefArrToMenu(webContents, menuDefArr);
-            menu.popup();
+            const menuState = { hasClick: false };
+            const menu = convertMenuDefArrToMenu(webContents, menuDefArr, menuState);
+            menu.popup({
+                callback: () => {
+                    if (!menuState.hasClick) {
+                        webContents.send("contextmenu-click", null);
+                    }
+                },
+            });
         });
         event.returnValue = true;
     }

emain/preload.ts

@@ -21,7 +21,8 @@ contextBridge.exposeInMainWorld("api", {
     showWorkspaceAppMenu: (workspaceId) => ipcRenderer.send("workspace-appmenu-show", workspaceId),
     showBuilderAppMenu: (builderId) => ipcRenderer.send("builder-appmenu-show", builderId),
     showContextMenu: (workspaceId, menu) => ipcRenderer.send("contextmenu-show", workspaceId, menu),
-    onContextMenuClick: (callback) => ipcRenderer.on("contextmenu-click", (_event, id) => callback(id)),
+    onContextMenuClick: (callback: (id: string | null) => void) =>
+        ipcRenderer.on("contextmenu-click", (_event, id: string | null) => callback(id)),
     downloadFile: (filePath) => ipcRenderer.send("download", { filePath }),
     openExternal: (url) => {
         if (url && typeof url === "string") {

eslint.config.js

@@ -73,7 +73,13 @@ export default [
 
     {
         rules: {
-            "@typescript-eslint/no-unused-vars": "warn",
+            "@typescript-eslint/no-unused-vars": [
+                "warn",
+                {
+                    argsIgnorePattern: "^_$",
+                    varsIgnorePattern: "^_$",
+                },
+            ],
             "prefer-const": "warn",
             "no-empty": "warn",
         },

frontend/app/app.scss

@@ -96,41 +96,3 @@ a {
         transition-delay: none !important;
     }
 }
-
-.flash-error-container {
-    position: absolute;
-    right: 10px;
-    bottom: 10px;
-    z-index: var(--zindex-flash-error-container);
-    display: flex;
-    flex-direction: column;
-    gap: 10px;
-
-    .flash-error {
-        background: var(--error-color);
-        color: var(--main-text-color);
-        border-radius: 4px;
-        padding: 10px;
-        display: flex;
-        flex-direction: column;
-        width: 280px;
-        border: 1px solid transparent;
-        max-height: 100px;
-        cursor: pointer;
-
-        .flash-error-scroll {
-            overflow-y: auto;
-            display: flex;
-            flex-direction: column;
-        }
-
-        &.hovered {
-            border: 1px solid var(--main-text-color);
-        }
-
-        .flash-error-title {
-            font-weight: bold;
-            margin-bottom: 5px;
-        }
-    }
-}

frontend/app/app.tsx

@@ -13,8 +13,6 @@ import {
     getSettingsPrefixAtom,
     getTabIndicatorAtom,
     globalStore,
-    isDev,
-    removeFlashError,
 } from "@/store/global";
 import { appHandleKeyDown, keyboardMouseDownHandler } from "@/store/keymodel";
 import { getElemAsStr } from "@/util/focusutil";
@@ -25,12 +23,11 @@ import clsx from "clsx";
 import debug from "debug";
 import { Provider, useAtomValue } from "jotai";
 import "overlayscrollbars/overlayscrollbars.css";
-import { Fragment, useEffect, useState } from "react";
+import { useEffect } from "react";
 import { DndProvider } from "react-dnd";
 import { HTML5Backend } from "react-dnd-html5-backend";
 import { AppBackground } from "./app-bg";
 import { CenteredDiv } from "./element/quickelems";
-import { NotificationBubbles } from "./notification/notificationbubbles";
 
 import "./app.scss";
 
@@ -237,78 +234,6 @@ const TabIndicatorAutoClearing = () => {
     return null;
 };
 
-const FlashError = () => {
-    const flashErrors = useAtomValue(atoms.flashErrors);
-    const [hoveredId, setHoveredId] = useState<string>(null);
-    const [ticker, setTicker] = useState<number>(0);
-
-    useEffect(() => {
-        if (flashErrors.length == 0 || hoveredId != null) {
-            return;
-        }
-        const now = Date.now();
-        for (let ferr of flashErrors) {
-            if (ferr.expiration == null || ferr.expiration < now) {
-                removeFlashError(ferr.id);
-            }
-        }
-        setTimeout(() => setTicker(ticker + 1), 1000);
-    }, [flashErrors, ticker, hoveredId]);
-
-    if (flashErrors.length == 0) {
-        return null;
-    }
-
-    function copyError(id: string) {
-        const ferr = flashErrors.find((f) => f.id === id);
-        if (ferr == null) {
-            return;
-        }
-        let text = "";
-        if (ferr.title != null) {
-            text += ferr.title;
-        }
-        if (ferr.message != null) {
-            if (text.length > 0) {
-                text += "\n";
-            }
-            text += ferr.message;
-        }
-        navigator.clipboard.writeText(text);
-    }
-
-    function convertNewlinesToBreaks(text) {
-        return text.split("\n").map((part, index) => (
-            <Fragment key={index}>
-                {part}
-                <br />
-            </Fragment>
-        ));
-    }
-
-    return (
-        <div className="flash-error-container">
-            {flashErrors.map((err, idx) => (
-                <div
-                    key={idx}
-                    className={clsx("flash-error", { hovered: hoveredId === err.id })}
-                    onClick={() => copyError(err.id)}
-                    onMouseEnter={() => setHoveredId(err.id)}
-                    onMouseLeave={() => setHoveredId(null)}
-                    title="Click to Copy Error Message"
-                >
-                    <div className="flash-error-scroll">
-                        {err.title != null ? <div className="flash-error-title">{err.title}</div> : null}
-                        {err.message != null ? (
-                            <div className="flash-error-message">{convertNewlinesToBreaks(err.message)}</div>
-                        ) : null}
-                    </div>
-                </div>
-            ))}
-        </div>
-    );
-};
-
 const AppInner = () => {
     const prefersReducedMotion = useAtomValue(atoms.prefersReducedMotionAtom);
     const client = useAtomValue(ClientModel.getInstance().clientAtom);
@@ -340,8 +265,6 @@ const AppInner = () => {
             <DndProvider backend={HTML5Backend}>
                 <Workspace />
             </DndProvider>
-            <FlashError />
-            {isDev() ? <NotificationBubbles></NotificationBubbles> : null}
         </div>
     );
 };

frontend/app/block/blockframe-header.tsx

@@ -11,7 +11,7 @@ import {
 import { ConnectionButton } from "@/app/block/connectionbutton";
 import { DurableSessionFlyover } from "@/app/block/durable-session-flyover";
 import { ContextMenuModel } from "@/app/store/contextmenu";
-import { getConnStatusAtom, recordTEvent, WOS } from "@/app/store/global";
+import { recordTEvent, refocusNode, WOS } from "@/app/store/global";
 import { globalStore } from "@/app/store/jotaiStore";
 import { uxCloseBlock } from "@/app/store/keymodel";
 import { RpcApi } from "@/app/store/wshclientapi";
@@ -141,7 +141,10 @@ const HeaderEndIcons = React.memo(({ viewModel, nodeModel, blockId }: HeaderEndI
             <OptMagnifyButton
                 key="unmagnify"
                 magnified={magnified}
-                toggleMagnify={nodeModel.toggleMagnify}
+                toggleMagnify={() => {
+                    nodeModel.toggleMagnify();
+                    setTimeout(() => refocusNode(blockId), 50);
+                }}
                 disabled={magnifyDisabled}
             />
         );
@@ -218,7 +221,13 @@ const BlockFrame_Header = ({
                 />
             )}
             {useTermHeader && termConfigedDurable != null && (
-                <DurableSessionFlyover key="durable-status" blockId={nodeModel.blockId} viewModel={viewModel} placement="bottom" divClassName="iconbutton disabled text-[13px] ml-[-4px]" />
+                <DurableSessionFlyover
+                    key="durable-status"
+                    blockId={nodeModel.blockId}
+                    viewModel={viewModel}
+                    placement="bottom"
+                    divClassName="iconbutton disabled text-[13px] ml-[-4px]"
+                />
             )}
             <HeaderTextElems viewModel={viewModel} blockData={blockData} preview={preview} error={error} />
             <HeaderEndIcons viewModel={viewModel} nodeModel={nodeModel} blockId={nodeModel.blockId} />