chore: bump package version to 0.8.0

Bypasses the Execution Policy for setting the script that adds wsh to
the path.

.github/workflows/bump-version.yml

@@ -58,6 +58,7 @@ jobs:
               shell: bash
 
             - name: "Push version bump: ${{ steps.bump-version.outputs.WAVETERM_VERSION }}"
+              if: github.ref_protected
               run: |
                   # Create a new commit for the package version bump in package.json
                   export VERSION=${{ steps.bump-version.outputs.WAVETERM_VERSION }}

.vscode/tasks.json

@@ -1,18 +0,0 @@
-{
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "Start Storybook",
-            "type": "shell",
-            "command": "yarn storybook",
-            "presentation": {
-                "reveal": "silent",
-                "panel": "shared"
-            },
-            "runOptions": {
-                "instanceLimit": 1,
-                "runOn": "folderOpen"
-            }
-        }
-    ]
-}

RELEASES.md

@@ -1,5 +1,12 @@
 # Building for release
 
+## Temporary instructions while waiting on GitHub support
+
+1. On the `wave8` branch, run `task version -- <none, patch, minor, major> <false, true>` based on the options mentioned in step 2 of the [Step-by-step guide](#step-by-step-guide).
+2. Commit and push the changes to the `wave8` branch.
+3. Manually create a tag named `v<version>` attached to `origin/wave8`. Push the tag to GitHub.
+4. This should kick off the build as normal and create a draft release when done. Continue from step 4 of the [Step-by-step guide](#step-by-step-guide).
+
 ## Step-by-step guide
 
 1. Go to the [Actions tab](https://github.com/wavetermdev/waveterm/actions) and select "Bump Version" from the left sidebar.

Taskfile.yml

@@ -17,8 +17,7 @@ vars:
 tasks:
     electron:dev:
         desc: Run the Electron application via the Vite dev server (enables hot reloading).
-        cmds:
-            - yarn dev
+        cmd: yarn dev
         deps:
             - yarn
             - build:backend
@@ -28,12 +27,15 @@ tasks:
 
     electron:start:
         desc: Run the Electron application directly.
-        cmds:
-            - yarn start
+        cmd: yarn start
         deps:
             - yarn
             - build:backend
 
+    storybook:
+        desc: Start the Storybook server.
+        cmd: yarn storybook
+
     package:
         desc: Package the application for the current platform.
         cmds:
@@ -98,12 +100,12 @@ tasks:
         requires:
             vars:
                 - ARCHS
-        cmds:
-            - cmd: CGO_ENABLED=1 GOARCH={{.GOARCH}} go build -tags "osusergo,netcgo,sqlite_omit_load_extension" -ldflags "{{.GO_LDFLAGS}} -X main.BuildTime=$({{.DATE}} +'%Y%m%d%H%M') -X main.WaveVersion={{.VERSION}}" -o dist/bin/wavesrv.{{if eq .GOARCH "amd64"}}x64{{else}}{{.GOARCH}}{{end}}{{exeExt}} cmd/server/main-server.go
-              for:
-                  var: ARCHS
-                  split: ","
-                  as: GOARCH
+        cmd:
+            cmd: CGO_ENABLED=1 GOARCH={{.GOARCH}} go build -tags "osusergo,netcgo,sqlite_omit_load_extension" -ldflags "{{.GO_LDFLAGS}} -X main.BuildTime=$({{.DATE}} +'%Y%m%d%H%M') -X main.WaveVersion={{.VERSION}}" -o dist/bin/wavesrv.{{if eq .GOARCH "amd64"}}x64{{else}}{{.GOARCH}}{{end}}{{exeExt}} cmd/server/main-server.go
+            for:
+                var: ARCHS
+                split: ","
+                as: GOARCH
         sources:
             - "cmd/server/*.go"
             - "pkg/**/*.go"
@@ -173,8 +175,7 @@ tasks:
             - "pkg/**/*.go"
         generates:
             - dist/bin/wsh-{{.VERSION}}-{{.GOOS}}.{{.NORMALIZEDARCH}}{{.EXT}}
-        cmds:
-            - (CGO_ENABLED=0 GOOS={{.GOOS}} GOARCH={{.GOARCH}} go build -ldflags="-s -w -X main.BuildTime=$({{.DATE}} +'%Y%m%d%H%M') -X main.WaveVersion={{.VERSION}}" -o dist/bin/wsh-{{.VERSION}}-{{.GOOS}}.{{.NORMALIZEDARCH}}{{.EXT}} cmd/wsh/main-wsh.go)
+        cmd: (CGO_ENABLED=0 GOOS={{.GOOS}} GOARCH={{.GOARCH}} go build -ldflags="-s -w -X main.BuildTime=$({{.DATE}} +'%Y%m%d%H%M') -X main.WaveVersion={{.VERSION}}" -o dist/bin/wsh-{{.VERSION}}-{{.GOOS}}.{{.NORMALIZEDARCH}}{{.EXT}} cmd/wsh/main-wsh.go)
         deps:
             - go:mod:tidy
         internal: true
@@ -251,8 +252,7 @@ tasks:
             - yarn.lock
             - package.json
             - .yarnrc.yml
-        cmds:
-            - yarn
+        cmd: yarn
 
     go:mod:tidy:
         desc: Runs `go mod tidy`
@@ -261,5 +261,4 @@ tasks:
             - go.sum
         sources:
             - go.mod
-        cmds:
-            - go mod tidy
+        cmd: go mod tidy

electron-builder.config.cjs

@@ -10,7 +10,7 @@ const path = require("path");
 const config = {
     appId: pkg.build.appId,
     productName: pkg.productName,
-    executableName: pkg.name,
+    executableName: pkg.productName,
     artifactName: "${productName}-${platform}-${arch}-${version}.${ext}",
     generateUpdatesFilesForAllChannels: true,
     npmRebuild: false,
@@ -55,6 +55,7 @@ const config = {
     linux: {
         artifactName: "${name}-${platform}-${arch}-${version}.${ext}",
         category: "TerminalEmulator",
+        executableName: pkg.name,
         icon: "build/icons.icns",
         target: ["zip", "deb", "rpm", "AppImage", "pacman"],
         synopsis: pkg.description,
@@ -86,7 +87,7 @@ const config = {
         if (context.electronPlatformName === "darwin" && context.arch === Arch.universal) {
             const packageBinDir = path.resolve(
                 context.appOutDir,
-                `${pkg.name}.app/Contents/Resources/app.asar.unpacked/dist/bin`
+                `${pkg.productName}.app/Contents/Resources/app.asar.unpacked/dist/bin`
             );
 
             // Reapply file permissions to the wavesrv binaries in the final app package

frontend/app/block/block.tsx

@@ -14,7 +14,7 @@ import {
     unregisterBlockComponentModel,
 } from "@/store/global";
 import * as WOS from "@/store/wos";
-import { getElemAsStr } from "@/util/focusutil";
+import { focusedBlockId, getElemAsStr } from "@/util/focusutil";
 import * as util from "@/util/util";
 import { CpuPlotView, CpuPlotViewModel, makeCpuPlotViewModel } from "@/view/cpuplot/cpuplot";
 import { HelpView, HelpViewModel, makeHelpViewModel } from "@/view/helpview/helpview";
@@ -159,12 +159,11 @@ const BlockFull = React.memo(({ nodeModel, viewModel }: FullBlockProps) => {
             return;
         }
         setBlockClicked(false);
-        const focusWithin = blockRef.current?.contains(document.activeElement);
+        const focusWithin = focusedBlockId() == nodeModel.blockId;
         if (!focusWithin) {
             setFocusTarget();
         }
         if (!isFocused) {
-            console.log("blockClicked focus", nodeModel.blockId);
             nodeModel.focusNode();
         }
     }, [blockClicked, isFocused]);

frontend/app/element/quicktips.tsx

@@ -144,6 +144,17 @@ const QuickTips = () => {
                         </div>
                     </div>
                 </div>
+
+                <div className="tip-section-header">Need More Help?</div>
+                <div className="tip">
+                    <div>
+                        <div>
+                            <a target="_blank" href="https://discord.gg/XfvZ334gwU" rel="noopener">
+                                Join Our Discord
+                            </a>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
     );

frontend/app/tab/tabbar.tsx

@@ -11,7 +11,7 @@ import React, { createRef, useCallback, useEffect, useRef, useState } from "reac
 import { debounce } from "throttle-debounce";
 import { Tab } from "./tab";
 import "./tabbar.less";
-import { UpdateStatusBanner } from "./updatestatus";
+import { UpdateStatusBanner } from "./updatebanner";
 
 const TAB_DEFAULT_WIDTH = 130;
 const TAB_MIN_WIDTH = 100;

frontend/app/tab/updatebanner.tsx

@@ -0,0 +1,71 @@
+import { Button } from "@/element/button";
+import { atoms, getApi } from "@/store/global";
+import { useAtomValue } from "jotai";
+import { memo, useEffect, useState } from "react";
+import "./updatebanner.less";
+
+const UpdateStatusBannerComponent = ({ buttonRef }: { buttonRef: React.RefObject<HTMLButtonElement> }) => {
+    const appUpdateStatus = useAtomValue(atoms.updaterStatusAtom);
+    const [updateStatusMessage, setUpdateStatusMessage] = useState<string>();
+    const [dismissBannerTimeout, setDismissBannerTimeout] = useState<NodeJS.Timeout>();
+
+    useEffect(() => {
+        let message: string;
+        let dismissBanner = false;
+        switch (appUpdateStatus) {
+            case "ready":
+                message = "Update Available";
+                break;
+            case "downloading":
+                message = "Downloading Update";
+                break;
+            case "installing":
+                message = "Installing Update";
+                break;
+            case "error":
+                message = "Updater Error: Try Checking Again";
+                dismissBanner = true;
+                break;
+            default:
+                break;
+        }
+        setUpdateStatusMessage(message);
+
+        // Clear any existing timeout
+        if (dismissBannerTimeout) {
+            clearTimeout(dismissBannerTimeout);
+        }
+
+        // If we want to dismiss the banner, set the new timeout, otherwise clear the state
+        if (dismissBanner) {
+            setDismissBannerTimeout(
+                setTimeout(() => {
+                    setUpdateStatusMessage(null);
+                    setDismissBannerTimeout(null);
+                }, 10000)
+            );
+        } else {
+            setDismissBannerTimeout(null);
+        }
+    }, [appUpdateStatus]);
+
+    function onClick() {
+        getApi().installAppUpdate();
+    }
+
+    if (updateStatusMessage) {
+        return (
+            <Button
+                ref={buttonRef}
+                className="update-available-button"
+                title={appUpdateStatus === "ready" ? "Click to Install Update" : updateStatusMessage}
+                onClick={onClick}
+                disabled={appUpdateStatus !== "ready"}
+            >
+                {updateStatusMessage}
+            </Button>
+        );
+    }
+};
+
+export const UpdateStatusBanner = memo(UpdateStatusBannerComponent) as typeof UpdateStatusBannerComponent;

frontend/app/tab/updatestatus.tsx

@@ -1,49 +0,0 @@
-import { Button } from "@/element/button";
-import { atoms, getApi } from "@/store/global";
-import { useAtomValue } from "jotai";
-import { memo } from "react";
-import "./updatestatus.less";
-
-const UpdateStatusBannerComponent = ({ buttonRef }: { buttonRef: React.RefObject<HTMLButtonElement> }) => {
-    const appUpdateStatus = useAtomValue(atoms.updaterStatusAtom);
-    function onClick() {
-        getApi().installAppUpdate();
-    }
-
-    let buttonText: string;
-    switch (appUpdateStatus) {
-        case "ready":
-            buttonText = "Update Available";
-            break;
-        case "checking":
-            buttonText = "Checking for Updates";
-            break;
-        case "downloading":
-            buttonText = "Downloading Update";
-            break;
-        case "installing":
-            buttonText = "Installing Update";
-            break;
-        case "error":
-            buttonText = "Updater Error: Try Checking Again";
-            break;
-        default:
-            break;
-    }
-
-    if (buttonText) {
-        return (
-            <Button
-                ref={buttonRef}
-                className="update-available-button"
-                title={appUpdateStatus === "ready" ? "Click to Install Update" : buttonText}
-                onClick={onClick}
-                disabled={appUpdateStatus !== "ready"}
-            >
-                {buttonText}
-            </Button>
-        );
-    }
-};
-
-export const UpdateStatusBanner = memo(UpdateStatusBannerComponent) as typeof UpdateStatusBannerComponent;

frontend/app/view/cpuplot/cpuplot.tsx

@@ -149,8 +149,11 @@ class CpuPlotViewModel {
             if (initialData == null) {
                 return;
             }
+            const newData = this.getDefaultData();
             const initialDataItems: DataItem[] = initialData.map(convertWaveEventToDataItem);
-            globalStore.set(this.addDataAtom, initialDataItems);
+            // splice the initial data into the default data (replacing the newest points)
+            newData.splice(newData.length - initialDataItems.length, initialDataItems.length, ...initialDataItems);
+            globalStore.set(this.addDataAtom, newData);
         } catch (e) {
             console.log("Error loading initial data for cpuplot", e);
         } finally {
@@ -158,7 +161,7 @@ class CpuPlotViewModel {
         }
     }
 
-    getDefaultData(): Array<DataItem> {
+    getDefaultData(): DataItem[] {
         // set it back one to avoid backwards line being possible
         const numPoints = globalStore.get(this.numPoints);
         const currentTime = Date.now() - 1000;
@@ -197,6 +200,8 @@ function CpuPlotView({ model, blockId }: CpuPlotViewProps) {
             lastConnName.current = connName;
             model.loadInitialData();
         }
+    }, [connStatus.status, connName]);
+    React.useEffect(() => {
         const unsubFn = waveEventSubscribe({
             eventType: "sysinfo",
             scope: connName,
@@ -209,11 +214,11 @@ function CpuPlotView({ model, blockId }: CpuPlotViewProps) {
                 addPlotData([dataItem]);
             },
         });
+        console.log("subscribe to sysinfo", connName);
         return () => {
             unsubFn();
         };
     }, [connName]);
-    React.useEffect(() => {}, [connName]);
     if (connStatus?.status != "connected") {
         return null;
     }

frontend/app/view/preview/preview.tsx

@@ -97,54 +97,6 @@ function isStreamingType(mimeType: string): boolean {
         mimeType.startsWith("image/")
     );
 }
-const previewTipText = `
-### Preview
-Preview is the generic type of block used for viewing files. This can take many different forms based on the type of file being viewed.
-You can use \`wsh view [path]\` from any Wave terminal window to open a preview block with the contents of the specified path (e.g. \`wsh view .\` or \`wsh view ~/myimage.jpg\`).
-
-#### Directory
-When looking at a directory, preview will show a file viewer much like MacOS' *Finder* application or Windows' *File Explorer* application. This variant is slightly more geared toward software development with the focus on seeing what is shown by the \`ls -alh\` command.
-
-##### View a New File
-The simplest way to view a new file is to double click its row in the file viewer. Alternatively, while the block is focused, you can use the ↑ and ↓ arrow keys to select a row and press enter to preview the associated file.
-
-##### View the Parent Directory
-In the directory view, this is as simple as opening the \`..\` file as if it were a regular file. This can be done with the method above.  You can also use the keyboard shortcut \`Cmd + ArrowUp\`.
-
-##### Navigate Back and Forward
-When looking at a file, you can navigate back by clicking the back button in the block header or the keyboard shortcut \`Cmd + ArrowLeft\`.  You can always navigate back and forward using \`Cmd + ArrowLeft\` and \`Cmd + ArrowRight\`.
-
-##### Filter the List of Files
-While the block is focused, you can filter by filename by typing a substring of the filename you're working for. To clear the filter, you can click the ✕ on the filter dropdown or press esc.
-
-##### Sort by a File Column
-To sort a file by a specific column, click on the header for that column. If you click the header again, it will reverse the sort order.
-
-##### Hide and Show Hidden Files
-At the right of the block header, there is an 👁️ button. Clicking this button hides and shows hidden files.
-
-##### Refresh the Directory
-At the right of the block header, there is a refresh button. Clicking this button refreshes the directory contents.
-
-##### Navigate to Common Directories
-At the left of the block header, there is a file icon. Clicking and holding on this icon opens a menu where you can select a common folder to navigate to. The available options are *Home*, *Desktop*, *Downloads*, and *Root*.
-
-##### Open a New Terminal in the Current Directory
-If you right click the header of the block (alternatively, click the gear icon), one of the menu items listed is **Open Terminal in New Block**. This will create a new terminal block at your current directory.
-
-##### Open a New Terminal in a Child Directory
-If you want to open a terminal for a child directory instead, you can right click on that file's row to get the **Open Terminal in New Block** option. Clicking this will open a terminal at that directory. Note that this option is only available for children that are directories.
-
-##### Open a New Preview for a Child
-To open a new Preview Block for a Child, you can right click on that file's row and select the **Open Preview in New Block** option.
-
-#### Markdown
-Opening a markdown file will bring up a view of the rendered markdown. These files cannot be edited in the preview at this time.
-
-#### Images/Media
-Opening a picture will bring up the image of that picture. Opening a video will bring up a player that lets you watch the video.
-`;
-
 export class PreviewModel implements ViewModel {
     viewType: string;
     blockId: string;
@@ -173,7 +125,8 @@ export class PreviewModel implements ViewModel {
     fullFile: jotai.Atom<Promise<FullFile>>;
     fileMimeType: jotai.Atom<Promise<string>>;
     fileMimeTypeLoadable: jotai.Atom<Loadable<string>>;
-    fileContent: jotai.Atom<Promise<string>>;
+    fileContentSaved: jotai.PrimitiveAtom<string | null>;
+    fileContent: jotai.WritableAtom<Promise<string>, [string], void>;
     newFileContent: jotai.PrimitiveAtom<string | null>;
 
     openFileModal: jotai.PrimitiveAtom<boolean>;
@@ -191,6 +144,8 @@ export class PreviewModel implements ViewModel {
     codeEditKeyDownHandler: (waveEvent: WaveKeyboardEvent) => boolean;
 
     setPreviewFileName(fileName: string) {
+        globalStore.set(this.fileContentSaved, null);
+        globalStore.set(this.newFileContent, null);
         services.ObjectService.UpdateObjectMeta(`block:${this.blockId}`, { file: fileName });
     }
 
@@ -430,10 +385,25 @@ export class PreviewModel implements ViewModel {
             return file;
         });
 
-        const fileContentAtom = jotai.atom<Promise<string>>(async (get) => {
-            const fullFile = await get(fullFileAtom);
-            return util.base64ToString(fullFile?.data64);
-        });
+        this.fileContentSaved = jotai.atom(null) as jotai.PrimitiveAtom<string | null>;
+        const fileContentAtom = jotai.atom(
+            async (get) => {
+                const _ = get(this.metaFilePath);
+                const newContent = get(this.newFileContent);
+                if (newContent != null) {
+                    return newContent;
+                }
+                const savedContent = get(this.fileContentSaved);
+                if (savedContent != null) {
+                    return savedContent;
+                }
+                const fullFile = await get(fullFileAtom);
+                return util.base64ToString(fullFile?.data64);
+            },
+            (get, set, update: string) => {
+                set(this.fileContentSaved, update);
+            }
+        );
 
         this.fullFile = fullFileAtom;
         this.fileContent = fileContentAtom;
@@ -590,6 +560,7 @@ export class PreviewModel implements ViewModel {
         const conn = globalStore.get(this.connection) ?? "";
         try {
             services.FileService.SaveFile(conn, filePath, util.stringToBase64(newFileContent));
+            globalStore.set(this.fileContent, newFileContent);
             globalStore.set(this.newFileContent, null);
             console.log("saved file", filePath);
         } catch (error) {

frontend/app/view/quicktipsview/quicktipsview.less

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 .quicktips-view {
-    padding: 10px 2px;
+    padding: 10px 5px;
     overflow: auto;
+    width: 100%;
 }

frontend/app/view/waveai/waveai.tsx

@@ -342,18 +342,24 @@ const ChatWindow = memo(
 
         const handleScrollbarInitialized = (instance: OverlayScrollbars) => {
             const { viewport } = instance.elements();
+            viewport.removeAttribute("tabindex");
             viewport.scrollTo({
                 behavior: "auto",
                 top: chatWindowRef.current?.scrollHeight || 0,
             });
         };
 
+        const handleScrollbarUpdated = (instance: OverlayScrollbars) => {
+            const { viewport } = instance.elements();
+            viewport.removeAttribute("tabindex");
+        };
+
         return (
             <OverlayScrollbarsComponent
                 ref={osRef}
                 className="scrollable"
                 options={{ scrollbars: { autoHide: "leave" } }}
-                events={{ initialized: handleScrollbarInitialized }}
+                events={{ initialized: handleScrollbarInitialized, updated: handleScrollbarUpdated }}
             >
                 <div ref={chatWindowRef} className="chat-window" style={msgWidths}>
                     <div className="filler"></div>
@@ -491,22 +497,6 @@ const WaveAi = ({ model }: { model: WaveAiModel; blockId: string }) => {
         setSelectedBlockIdx(null);
     }, [messages, value]);
 
-    const handleContainerClick = (event: React.MouseEvent<HTMLDivElement>) => {
-        inputRef.current?.focus();
-
-        const target = event.target as HTMLElement;
-        if (
-            target.closest(".copy-button") ||
-            target.closest(".fa-square-terminal") ||
-            target.closest(".waveai-input")
-        ) {
-            return;
-        }
-
-        const pre = target.closest("pre");
-        updatePreTagOutline(pre);
-    };
-
     const updateScrollTop = () => {
         const pres = chatWindowRef.current?.querySelectorAll("pre");
         if (!pres || selectedBlockIdx === null) return;
@@ -610,7 +600,7 @@ const WaveAi = ({ model }: { model: WaveAiModel; blockId: string }) => {
     }, [locked, handleEnterKeyPressed]);
 
     return (
-        <div ref={waveaiRef} className="waveai" onClick={handleContainerClick}>
+        <div ref={waveaiRef} className="waveai">
             <ChatWindow ref={osRef} chatWindowRef={chatWindowRef} messages={messages} msgWidths={msgWidths} />
             <div className="waveai-controls">
                 <div className="waveai-input-wrapper">

frontend/app/view/webview/webview.tsx

@@ -1,8 +1,10 @@
 // Copyright 2024, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { getApi, openLink } from "@/app/store/global";
+import { getApi, openLink, useSettingsKeyAtom } from "@/app/store/global";
 import { getSimpleControlShiftAtom } from "@/app/store/keymodel";
+import { RpcApi } from "@/app/store/wshclientapi";
+import { WindowRpcClient } from "@/app/store/wshrpcutil";
 import { NodeModel } from "@/layout/index";
 import { WOS, globalStore } from "@/store/global";
 import * as services from "@/store/services";
@@ -30,6 +32,7 @@ export class WebViewModel implements ViewModel {
     webviewRef: React.RefObject<WebviewTag>;
     urlInputRef: React.RefObject<HTMLInputElement>;
     nodeModel: NodeModel;
+    endIconButtons?: jotai.Atom<IconButtonDecl[]>;
 
     constructor(blockId: string, nodeModel: NodeModel) {
         this.nodeModel = nodeModel;
@@ -48,7 +51,8 @@ export class WebViewModel implements ViewModel {
         this.webviewRef = React.createRef<WebviewTag>();
 
         this.viewText = jotai.atom((get) => {
-            let url = get(this.blockAtom)?.meta?.url || "";
+            const defaultUrlAtom = useSettingsKeyAtom("web:defaulturl");
+            let url = get(this.blockAtom)?.meta?.url || get(defaultUrlAtom);
             const currUrl = get(this.url);
             if (currUrl !== undefined) {
                 url = currUrl;
@@ -91,6 +95,22 @@ export class WebViewModel implements ViewModel {
                 },
             ] as HeaderElem[];
         });
+
+        this.endIconButtons = jotai.atom((get) => {
+            return [
+                {
+                    elemtype: "iconbutton",
+                    icon: "arrow-up-right-from-square",
+                    title: "Open in External Browser",
+                    click: () => {
+                        const url = this.getUrl();
+                        if (url != null && url != "") {
+                            return getApi().openExternal(this.getUrl());
+                        }
+                    },
+                },
+            ];
+        });
     }
 
     /**
@@ -199,7 +219,11 @@ export class WebViewModel implements ViewModel {
         globalStore.set(this.url, url);
     }
 
-    ensureUrlScheme(url: string) {
+    ensureUrlScheme(url: string, searchTemplate: string) {
+        if (url == null) {
+            url = "";
+        }
+
         if (/^(http|https):/.test(url)) {
             // If the URL starts with http: or https:, return it as is
             return url;
@@ -223,23 +247,10 @@ export class WebViewModel implements ViewModel {
         }
 
         // Otherwise, treat it as a search query
-        return `https://www.google.com/search?q=${encodeURIComponent(url)}`;
-    }
-
-    normalizeUrl(url: string) {
-        if (!url) {
-            return url;
-        }
-
-        try {
-            const parsedUrl = new URL(url);
-            if (parsedUrl.hostname.startsWith("www.")) {
-                parsedUrl.hostname = parsedUrl.hostname.slice(4);
-            }
-            return parsedUrl.href;
-        } catch (e) {
-            return url.replace(/\/+$/, "") + "/";
+        if (searchTemplate == null) {
+            return `https://www.google.com/search?q=${encodeURIComponent(url)}`;
         }
+        return searchTemplate.replace("{query}", encodeURIComponent(url));
     }
 
     /**
@@ -247,7 +258,9 @@ export class WebViewModel implements ViewModel {
      * @param newUrl The new URL to load in the webview.
      */
     loadUrl(newUrl: string, reason: string) {
-        const nextUrl = this.ensureUrlScheme(newUrl);
+        const defaultSearchAtom = useSettingsKeyAtom("web:defaultsearch");
+        const searchTemplate = globalStore.get(defaultSearchAtom);
+        const nextUrl = this.ensureUrlScheme(newUrl, searchTemplate);
         console.log("webview loadUrl", reason, nextUrl, "cur=", this.webviewRef?.current.getURL());
         if (newUrl != nextUrl) {
             globalStore.set(this.url, nextUrl);
@@ -317,8 +330,20 @@ export class WebViewModel implements ViewModel {
         return false;
     }
 
-    getSettingsMenuItems() {
+    getSettingsMenuItems(): ContextMenuItem[] {
         return [
+            {
+                label: "Set Homepage",
+                click: async () => {
+                    const url = this.getUrl();
+                    if (url != null && url != "") {
+                        RpcApi.SetConfigCommand(WindowRpcClient, { "web:defaulturl": url });
+                    }
+                },
+            },
+            {
+                type: "separator",
+            },
             {
                 label: this.webviewRef.current?.isDevToolsOpened() ? "Close DevTools" : "Open DevTools",
                 click: async () => {
@@ -347,7 +372,12 @@ interface WebViewProps {
 
 const WebView = memo(({ model }: WebViewProps) => {
     const blockData = jotai.useAtomValue(model.blockAtom);
-    const metaUrl = blockData?.meta?.url;
+    const defaultUrlAtom = useSettingsKeyAtom("web:defaulturl");
+    const defaultUrl = jotai.useAtomValue(defaultUrlAtom);
+    const defaultSearchAtom = useSettingsKeyAtom("web:defaultsearch");
+    const defaultSearch = jotai.useAtomValue(defaultSearchAtom);
+    let metaUrl = blockData?.meta?.url || defaultUrl;
+    metaUrl = model.ensureUrlScheme(metaUrl, defaultSearch);
     const metaUrlRef = React.useRef(metaUrl);
 
     // The initial value of the block metadata URL when the component first renders. Used to set the starting src value for the webview.

frontend/layout/lib/layoutModel.ts

@@ -302,7 +302,7 @@ export class LayoutModel {
      * Perform an action against the layout tree state.
      * @param action The action to perform.
      */
-    treeReducer(action: LayoutTreeAction) {
+    treeReducer(action: LayoutTreeAction, setState = true) {
         switch (action.type) {
             case LayoutTreeActionType.ComputeMove:
                 this.setter(
@@ -369,7 +369,7 @@ export class LayoutModel {
                 this.magnifiedNodeId = this.treeState.magnifiedNodeId;
             }
             this.updateTree();
-            this.setTreeStateAtom(true);
+            if (setState) this.setTreeStateAtom(true);
         }
     }
 
@@ -377,7 +377,7 @@ export class LayoutModel {
      * Callback that is invoked when the upstream tree state has been updated. This ensures the model is updated if the atom is not fully loaded when the model is first instantiated.
      * @param force Whether to force the local tree state to update, regardless of whether the state is already up to date.
      */
-    onTreeStateAtomUpdated = debounce(50, async (force = false) => {
+    async onTreeStateAtomUpdated(force = false) {
         const treeState = this.getter(this.treeStateAtom);
         // Only update the local tree state if it is different from the one in the upstream atom. This function is called even when the update was initiated by the LayoutModel, so we need to filter out false positives or we'll enter an infinite loop.
         if (
@@ -403,7 +403,7 @@ export class LayoutModel {
                                 magnified: action.magnified,
                                 focused: action.focused,
                             };
-                            this.treeReducer(insertNodeAction);
+                            this.treeReducer(insertNodeAction, false);
                             break;
                         }
                         case LayoutTreeActionType.DeleteNode: {
@@ -434,13 +434,16 @@ export class LayoutModel {
                                 magnified: action.magnified,
                                 focused: action.focused,
                             };
-                            this.treeReducer(insertAction);
+                            this.treeReducer(insertAction, false);
                             break;
                         }
                         case LayoutTreeActionType.ClearTree: {
-                            this.treeReducer({
-                                type: LayoutTreeActionType.ClearTree,
-                            } as LayoutTreeClearTreeAction);
+                            this.treeReducer(
+                                {
+                                    type: LayoutTreeActionType.ClearTree,
+                                } as LayoutTreeClearTreeAction,
+                                false
+                            );
                             break;
                         }
                         default:
@@ -448,12 +451,13 @@ export class LayoutModel {
                             break;
                     }
                 }
+                this.setTreeStateAtom(true);
             } else {
                 this.updateTree();
                 this.setTreeStateAtom(force);
             }
         }
-    });
+    }
 
     /**
      * Set the upstream tree state atom to the value of the local tree state.

frontend/layout/lib/layoutModelHooks.ts

@@ -25,7 +25,7 @@ export function getLayoutModelForTab(tabAtom: Atom<Tab>): LayoutModel {
     }
     const layoutTreeStateAtom = withLayoutTreeStateAtomFromTab(tabAtom);
     const layoutModel = new LayoutModel(layoutTreeStateAtom, globalStore.get, globalStore.set);
-    globalStore.sub(layoutTreeStateAtom, () => fireAndForget(() => layoutModel.onTreeStateAtomUpdated()));
+    globalStore.sub(layoutTreeStateAtom, () => fireAndForget(async () => layoutModel.onTreeStateAtomUpdated()));
     layoutModelMap.set(tabId, layoutModel);
     return layoutModel;
 }
@@ -56,7 +56,7 @@ export function useTileLayout(tabAtom: Atom<Tab>, tileContent: TileLayoutContent
     useResizeObserver(layoutModel?.displayContainerRef, layoutModel?.onContainerResize);
 
     // Once the TileLayout is mounted, re-run the state update to get all the nodes to flow in the layout.
-    useLayoutEffect(() => fireAndForget(() => layoutModel.onTreeStateAtomUpdated(true)), []);
+    useEffect(() => fireAndForget(async () => layoutModel.onTreeStateAtomUpdated(true)), []);
 
     useEffect(() => layoutModel.registerTileLayout(tileContent), [tileContent]);
     return layoutModel;

frontend/types/gotypes.d.ts

@@ -421,6 +421,8 @@ declare global {
         "editor:stickyscrollenabled"?: boolean;
         "web:*"?: boolean;
         "web:openlinksinternally"?: boolean;
+        "web:defaulturl"?: string;
+        "web:defaultsearch"?: string;
         "blockheader:*"?: boolean;
         "blockheader:showblockids"?: boolean;
         "autoupdate:*"?: boolean;

frontend/util/focusutil.ts

@@ -54,7 +54,7 @@ export function focusedBlockId(): string {
         }
     }
     const sel = document.getSelection();
-    if (sel && sel.anchorNode) {
+    if (sel && sel.anchorNode && sel.rangeCount > 0 && !sel.isCollapsed) {
         let anchor = sel.anchorNode;
         if (anchor instanceof Text) {
             anchor = anchor.parentElement;