Merge remote-tracking branch 'origin/main' into sawka/preview-updates

sawka · sawka · commit f4f10a6db614 · 2026-03-06T16:40:30.000-08:00
diff --git a/docs/docs/wsh-reference.mdx b/docs/docs/wsh-reference.mdx
@@ -23,6 +23,7 @@ You can open a preview block with the contents of any file or directory by runni
 
 ```sh
 wsh view [path]
+wsh view -m [path]           # opens in magnified block
 ```
 
 You can use this command to easily preview images, markdown files, and directories. For code/text files this will open
@@ -34,9 +35,29 @@ a codeedit block which you can use to quickly edit the file using Wave's embedde
 
 ```sh
 wsh edit [path]
+wsh edit -m [path]           # opens in magnified block
 ```
 
-This will open up codeedit for the specified file. This is useful for quickly editing files on a local or remote machine in our graphical editor. This command will wait until the file is closed before exiting (unlike `view`) so you can set your `$EDITOR` to `wsh editor` for a seamless experience. You can combine this with a `-m` flag to open the editor in magnified mode.
+This will open up a codeedit block for the specified file. This is useful for quickly editing files on a local or remote machine in Wave's graphical editor. This command returns immediately after opening the block. 
+
+For `$EDITOR` integration (e.g. with `git commit`), see [`wsh editor`](#editor) which blocks until the editor is closed.
+
+---
+
+## editor
+
+```sh
+wsh editor [path]
+wsh editor -m [path]         # opens in magnified block
+```
+
+This opens a codeedit block for the specified file and **blocks until the editor is closed**. This is useful for setting your `$EDITOR` environment variable so that CLI tools (e.g. `git commit`, `crontab -e`) open files in Wave's graphical editor:
+
+```sh
+export EDITOR="wsh editor"
+```
+
+The file must already exist. Use `-m` to open the editor in magnified mode.
 
 ---
 
diff --git a/emain/emain-ipc.ts b/emain/emain-ipc.ts
@@ -24,7 +24,7 @@ import { callWithOriginalXdgCurrentDesktopAsync, unamePlatform } from "./emain-p
 import { getWaveTabViewByWebContentsId } from "./emain-tabview";
 import { handleCtrlShiftState } from "./emain-util";
 import { getWaveVersion } from "./emain-wavesrv";
-import { createNewWaveWindow, focusedWaveWindow, getWaveWindowByWebContentsId } from "./emain-window";
+import { createNewWaveWindow, getWaveWindowByWebContentsId } from "./emain-window";
 import { ElectronWshClient } from "./emain-wsh";
 
 const electronApp = electron.app;
@@ -130,12 +130,18 @@ function getUrlInSession(session: Electron.Session, url: string): Promise<UrlInS
     });
 }
 
-function saveImageFileWithNativeDialog(defaultFileName: string, mimeType: string, readStream: Readable) {
+function saveImageFileWithNativeDialog(
+    sender: electron.WebContents,
+    defaultFileName: string,
+    mimeType: string,
+    readStream: Readable
+) {
     if (defaultFileName == null || defaultFileName == "") {
         defaultFileName = "image";
     }
-    const ww = focusedWaveWindow;
+    const ww = electron.BrowserWindow.fromWebContents(sender);
     if (ww == null) {
+        readStream.destroy();
         return;
     }
     const mimeToExtension: { [key: string]: string } = {
@@ -164,6 +170,7 @@ function saveImageFileWithNativeDialog(defaultFileName: string, mimeType: string
         })
         .then((file) => {
             if (file.canceled) {
+                readStream.destroy();
                 return;
             }
             const writeStream = fs.createWriteStream(file.filePath);
@@ -213,7 +220,12 @@ export function initIpcHandlers() {
                     const resultP = getUrlInSession(event.sender.session, payload.src);
                     resultP
                         .then((result) => {
-                            saveImageFileWithNativeDialog(result.fileName, result.mimeType, result.stream);
+                            saveImageFileWithNativeDialog(
+                                event.sender.hostWebContents,
+                                result.fileName,
+                                result.mimeType,
+                                result.stream
+                            );
                         })
                         .catch((e) => {
                             console.log("error getting image", e);
@@ -477,7 +489,7 @@ export function initIpcHandlers() {
     });
 
     electron.ipcMain.handle("save-text-file", async (event, fileName: string, content: string) => {
-        const ww = focusedWaveWindow;
+        const ww = electron.BrowserWindow.fromWebContents(event.sender);
         if (ww == null) {
             return false;
         }
diff --git a/emain/emain-menu.ts b/emain/emain-menu.ts
@@ -9,7 +9,7 @@ import { focusedBuilderWindow, getBuilderWindowById } from "./emain-builder";
 import { openBuilderWindow } from "./emain-ipc";
 import { isDev, unamePlatform } from "./emain-platform";
 import { clearTabCache } from "./emain-tabview";
-import { decreaseZoomLevel, increaseZoomLevel } from "./emain-util";
+import { decreaseZoomLevel, increaseZoomLevel, resetZoomLevel } from "./emain-util";
 import {
     createNewWaveWindow,
     createWorkspace,
@@ -238,8 +238,7 @@ function makeViewMenu(
             click: (_, window) => {
                 const wc = getWindowWebContents(window) ?? webContents;
                 if (wc) {
-                    wc.setZoomFactor(1);
-                    wc.send("zoom-factor-change", 1);
+                    resetZoomLevel(wc);
                 }
             },
         },
diff --git a/emain/emain-tabview.ts b/emain/emain-tabview.ts
@@ -15,6 +15,7 @@ import {
     handleCtrlShiftFocus,
     handleCtrlShiftState,
     increaseZoomLevel,
+    resetZoomLevel,
     shFrameNavHandler,
     shNavHandler,
 } from "./emain-util";
@@ -48,8 +49,7 @@ function handleWindowsMenuAccelerators(
     }
 
     if (checkKeyPressed(waveEvent, "Ctrl:0")) {
-        tabView.webContents.setZoomFactor(1);
-        tabView.webContents.send("zoom-factor-change", 1);
+        resetZoomLevel(tabView.webContents);
         return true;
     }
 
@@ -165,9 +165,6 @@ export class WaveTabView extends WebContentsView {
             removeWaveTabView(this.waveTabId);
             this.isDestroyed = true;
         });
-        this.webContents.on("zoom-changed", (_event, zoomDirection) => {
-            this.webContents.send("zoom-factor-change", this.webContents.getZoomFactor());
-        });
         this.setBackgroundColor(computeBgColor(fullConfig));
     }
 
@@ -339,9 +336,6 @@ export async function getOrCreateWebViewForTab(waveWindowId: string, tabId: stri
             }
         }
     });
-    tabView.webContents.on("zoom-changed", (e) => {
-        tabView.webContents.send("zoom-changed");
-    });
     tabView.webContents.setWindowOpenHandler(({ url, frameName }) => {
         if (url.startsWith("http://") || url.startsWith("https://") || url.startsWith("file://")) {
             console.log("openExternal fallback", url);
diff --git a/emain/emain-util.ts b/emain/emain-util.ts
@@ -12,16 +12,36 @@ const MinZoomLevel = 0.4;
 const MaxZoomLevel = 2.6;
 const ZoomDelta = 0.2;
 
+// Note: Chromium automatically syncs zoom factor across all WebContents
+// sharing the same origin/session, so we only need to notify renderers
+// to update their CSS/state — not call setZoomFactor on each one.
+// We broadcast to all WebContents (including devtools, webviews, etc.) but
+// that is safe because "zoom-factor-change" is a custom app-defined event
+// that only our renderers listen to; unrecognized IPC messages are ignored.
+function broadcastZoomFactorChanged(newZoomFactor: number): void {
+    for (const wc of electron.webContents.getAllWebContents()) {
+        if (wc.isDestroyed()) {
+            continue;
+        }
+        wc.send("zoom-factor-change", newZoomFactor);
+    }
+}
+
 export function increaseZoomLevel(webContents: electron.WebContents): void {
     const newZoom = Math.min(MaxZoomLevel, webContents.getZoomFactor() + ZoomDelta);
     webContents.setZoomFactor(newZoom);
-    webContents.send("zoom-factor-change", newZoom);
+    broadcastZoomFactorChanged(newZoom);
 }
 
 export function decreaseZoomLevel(webContents: electron.WebContents): void {
     const newZoom = Math.max(MinZoomLevel, webContents.getZoomFactor() - ZoomDelta);
     webContents.setZoomFactor(newZoom);
-    webContents.send("zoom-factor-change", newZoom);
+    broadcastZoomFactorChanged(newZoom);
+}
+
+export function resetZoomLevel(webContents: electron.WebContents): void {
+    webContents.setZoomFactor(1);
+    broadcastZoomFactorChanged(1);
 }
 
 export function getElectronExecPath(): string {
diff --git a/emain/emain-window.ts b/emain/emain-window.ts
@@ -273,6 +273,7 @@ export class WaveBrowserWindow extends BaseWindow {
             if (getGlobalIsRelaunching()) {
                 return;
             }
+            focusedWaveWindow = this; // eslint-disable-line @typescript-eslint/no-this-alias
             console.log("focus win", this.waveWindowId);
             fireAndForget(() => ClientService.FocusWindow(this.waveWindowId));
             setWasInFg(true);
diff --git a/emain/emain.ts b/emain/emain.ts
@@ -384,6 +384,10 @@ async function appMain() {
         electronApp.quit();
         return;
     }
+    electronApp.on("second-instance", (_event, argv, workingDirectory) => {
+        console.log("second-instance event, argv:", argv, "workingDirectory:", workingDirectory);
+        fireAndForget(createNewWaveWindow);
+    });
     try {
         await runWaveSrv(handleWSEvent);
     } catch (e) {
diff --git a/frontend/app/modals/about.tsx b/frontend/app/modals/about.tsx
@@ -1,13 +1,16 @@
-// Copyright 2025, Command Line Inc.
+// Copyright 2026, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
 import Logo from "@/app/asset/logo.svg";
+import { OnboardingGradientBg } from "@/app/onboarding/onboarding-common";
 import { modalsModel } from "@/app/store/modalmodel";
-import { Modal } from "./modal";
-
+import { RpcApi } from "@/app/store/wshclientapi";
+import { TabRpcClient } from "@/app/store/wshrpcutil";
 import { isDev } from "@/util/isdev";
-import { useState } from "react";
+import { fireAndForget } from "@/util/util";
+import { useEffect, useState } from "react";
 import { getApi } from "../store/global";
+import { Modal } from "./modal";
 
 interface AboutModalVProps {
     versionString: string;
@@ -19,13 +22,14 @@ const AboutModalV = ({ versionString, updaterChannel, onClose }: AboutModalVProp
     const currentDate = new Date();
 
     return (
-        <Modal className="pt-[34px] pb-[34px]" onClose={onClose}>
-            <div className="flex flex-col gap-[26px] w-full">
+        <Modal className="pt-[34px] pb-[34px] overflow-hidden w-[450px]" onClose={onClose}>
+            <OnboardingGradientBg />
+            <div className="flex flex-col gap-[26px] w-full relative z-10">
                 <div className="flex flex-col items-center justify-center gap-4 self-stretch w-full text-center">
                     <Logo />
                     <div className="text-[25px]">Wave Terminal</div>
                     <div className="leading-5">
-                        Open-Source AI-Native Terminal
+                        Open-Source AI-Integrated Terminal
                         <br />
                         Built for Seamless Workflows
                     </div>
@@ -35,30 +39,38 @@ const AboutModalV = ({ versionString, updaterChannel, onClose }: AboutModalVProp
                     <br />
                     Update Channel: {updaterChannel}
                 </div>
-                <div className="flex items-start gap-[10px] self-stretch w-full text-center">
+                <div className="grid grid-cols-2 gap-[10px] self-stretch w-full">
                     <a
                         href="https://github.com/wavetermdev/waveterm?ref=about"
                         target="_blank"
                         rel="noopener"
-                        className="inline-flex items-center px-4 py-2 rounded border border-border hover:bg-hoverbg transition-colors duration-200"
+                        className="inline-flex items-center justify-center px-4 py-2 rounded border border-border hover:bg-hoverbg transition-colors duration-200"
                     >
-                        <i className="fa-brands fa-github mr-2"></i>Github
+                        <i className="fa-brands fa-github mr-2"></i>GitHub
                     </a>
                     <a
                         href="https://www.waveterm.dev/?ref=about"
                         target="_blank"
                         rel="noopener"
-                        className="inline-flex items-center px-4 py-2 rounded border border-border hover:bg-hoverbg transition-colors duration-200"
+                        className="inline-flex items-center justify-center px-4 py-2 rounded border border-border hover:bg-hoverbg transition-colors duration-200"
                     >
                         <i className="fa-sharp fa-light fa-globe mr-2"></i>Website
                     </a>
                     <a
                         href="https://github.com/wavetermdev/waveterm/blob/main/ACKNOWLEDGEMENTS.md"
                         target="_blank"
                         rel="noopener"
-                        className="inline-flex items-center px-4 py-2 rounded border border-border hover:bg-hoverbg transition-colors duration-200"
+                        className="inline-flex items-center justify-center px-4 py-2 rounded border border-border hover:bg-hoverbg transition-colors duration-200"
                     >
-                        <i className="fa-sharp fa-light fa-heart mr-2"></i>Acknowledgements
+                        <i className="fa-sharp fa-light fa-book mr-2"></i>Open Source
+                    </a>
+                    <a
+                        href="https://github.com/sponsors/wavetermdev"
+                        target="_blank"
+                        rel="noopener"
+                        className="inline-flex items-center justify-center px-4 py-2 rounded border border-border hover:bg-hoverbg transition-colors duration-200"
+                    >
+                        <i className="fa-sharp fa-light fa-heart mr-2"></i>Sponsor
                     </a>
                 </div>
                 <div className="items-center gap-4 self-stretch w-full text-center">
@@ -76,6 +88,16 @@ const AboutModal = () => {
     const [updaterChannel] = useState(() => getApi().getUpdaterChannel());
     const versionString = `${details.version} (${isDev() ? "dev-" : ""}${details.buildTime})`;
 
+    useEffect(() => {
+        fireAndForget(async () => {
+            RpcApi.RecordTEventCommand(
+                TabRpcClient,
+                { event: "action:other", props: { "action:type": "about" } },
+                { noresponse: true }
+            );
+        });
+    }, []);
+
     return (
         <AboutModalV
             versionString={versionString}
diff --git a/frontend/layout/lib/utils.ts b/frontend/layout/lib/utils.ts
@@ -74,10 +74,6 @@ export function setTransform(
         top: 0,
         left: 0,
         transform: translate,
-        WebkitTransform: translate,
-        MozTransform: translate,
-        msTransform: translate,
-        OTransform: translate,
         width: setSize ? `${widthRounded}px` : undefined,
         height: setSize ? `${heightRounded}px` : undefined,
         position: "absolute",
diff --git a/frontend/layout/tests/layoutTree.test.ts b/frontend/layout/tests/layoutTree.test.ts
@@ -13,9 +13,11 @@ import {
 import { newLayoutTreeState } from "./model";
 
 test("layoutTreeStateReducer - compute move", () => {
-    let treeState = newLayoutTreeState(newLayoutNode(undefined, undefined, undefined, { blockId: "root" }));
-    assert(treeState.rootNode.data!.blockId === "root", "root should have no children and should have data");
-    let node1 = newLayoutNode(undefined, undefined, undefined, { blockId: "node1" });
+    const nodeA = newLayoutNode(undefined, undefined, undefined, { blockId: "nodeA" });
+    const node1 = newLayoutNode(undefined, undefined, undefined, { blockId: "node1" });
+    const node2 = newLayoutNode(undefined, undefined, undefined, { blockId: "node2" });
+    const treeState = newLayoutTreeState(newLayoutNode(undefined, undefined, [nodeA, node1, node2]));
+    assert(treeState.rootNode.children!.length === 3, "root should have three children");
     let pendingAction = computeMoveNode(treeState, {
         type: LayoutTreeActionType.ComputeMove,
         nodeId: treeState.rootNode.id,
@@ -29,12 +31,11 @@ test("layoutTreeStateReducer - compute move", () => {
     assert(insertOperation.insertAtRoot, "insert operation insertAtRoot should be true");
     moveNode(treeState, insertOperation);
     assert(
-        treeState.rootNode.data === undefined && treeState.rootNode.children!.length === 2,
-        "root node should now have no data and should have two children"
+        treeState.rootNode.data === undefined && treeState.rootNode.children!.length === 3,
+        "root node should still have three children"
     );
     assert(treeState.rootNode.children![1].data!.blockId === "node1", "root's second child should be node1");
 
-    let node2 = newLayoutNode(undefined, undefined, undefined, { blockId: "node2" });
     pendingAction = computeMoveNode(treeState, {
         type: LayoutTreeActionType.ComputeMove,
         nodeId: node1.id,
@@ -48,15 +49,15 @@ test("layoutTreeStateReducer - compute move", () => {
     assert(!insertOperation2.insertAtRoot, "insert operation insertAtRoot should be false");
     moveNode(treeState, insertOperation2);
     assert(
-        treeState.rootNode.data === undefined && treeState.rootNode.children!.length === 2,
-        "root node should still have three children"
+        treeState.rootNode.data === undefined && (treeState.rootNode.children!.length as number) === 2,
+        "root node should now have two children after node2 moved into node1"
     );
     assert(treeState.rootNode.children![1].children!.length === 2, "root's second child should now have two children");
 });
 
 test("computeMove - noop action", () => {
-    let nodeToMove = newLayoutNode(undefined, undefined, undefined, { blockId: "nodeToMove" });
-    let treeState = newLayoutTreeState(
+    const nodeToMove = newLayoutNode(undefined, undefined, undefined, { blockId: "nodeToMove" });
+    const treeState = newLayoutTreeState(
         newLayoutNode(undefined, undefined, [
             nodeToMove,
             newLayoutNode(undefined, undefined, undefined, { blockId: "otherNode" }),
diff --git a/go.mod b/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/sashabaranov/go-openai v1.41.2
 	github.com/sawka/txwrap v0.2.0
-	github.com/shirou/gopsutil/v4 v4.26.1
+	github.com/shirou/gopsutil/v4 v4.26.2
 	github.com/skeema/knownhosts v1.3.1
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.10.2
@@ -49,7 +49,7 @@ require (
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/ebitengine/purego v0.9.1 // indirect
+	github.com/ebitengine/purego v0.10.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
diff --git a/go.sum b/go.sum
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -273,6 +273,7 @@ export class WaveBrowserWindow extends BaseWindow {`
`273`	`273`	`if (getGlobalIsRelaunching()) {`
`274`	`274`	`return;`
`275`	`275`	`}`
	`276`	`+ focusedWaveWindow = this; // eslint-disable-line @typescript-eslint/no-this-alias`
`276`	`277`	`console.log("focus win", this.waveWindowId);`
`277`	`278`	`fireAndForget(() => ClientService.FocusWindow(this.waveWindowId));`
`278`	`279`	`setWasInFg(true);`