merge branch 'main' into ssh-extra-fixes

A user recently reported a crash on a failed connection. This handles
these errors more gracefully than the previous system and prints the
errors to the connection prompt.

.github/workflows/build-helper.yml

@@ -41,6 +41,7 @@ jobs:
                   cd scripthaus;
                   go get ./...;
                   CGO_ENABLED=1 go build -o scripthaus cmd/main.go
+                  echo $PWD >> $GITHUB_PATH
             - uses: actions/setup-node@v4
               with:
                   node-version: ${{env.NODE_VERSION}}
@@ -53,7 +54,7 @@ jobs:
             - name: Install Yarn Dependencies
               run: yarn --frozen-lockfile
             - name: Build ${{ matrix.platform }}/${{ matrix.arch }}
-              run: ./scripthaus/scripthaus run ${{ matrix.scripthaus }}
+              run: scripthaus run ${{ matrix.scripthaus }}
               env:
                   GOARCH: ${{ matrix.arch }}
                   CSC_LINK: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_CERTIFICATE}}

.github/workflows/codeql.yml

@@ -47,6 +47,32 @@ jobs:
             - name: Checkout repository
               uses: actions/checkout@v4
 
+            - name: Checkout Scripthaus (Go only)
+              if: matrix.language == 'go'
+              uses: actions/checkout@v4
+              with:
+                  repository: scripthaus-dev/scripthaus
+                  path: scripthaus
+
+            - name: Setup Go (Go only)
+              uses: actions/setup-go@v5
+              if: matrix.language == 'go'
+              with:
+                  go-version: stable
+                  cache-dependency-path: |
+                      wavesrv/go.sum
+                      waveshell/go.sum
+                      scripthaus/go.sum
+
+            - name: Install Scripthaus (Go only)
+              if: matrix.language == 'go'
+              run: |
+                  go work use ./scripthaus;
+                  cd scripthaus;
+                  go get ./...;
+                  CGO_ENABLED=1 go build -o scripthaus cmd/main.go
+                  echo $PWD >> $GITHUB_PATH
+
             # Initializes the CodeQL tools for scanning.
             - name: Initialize CodeQL
               uses: github/codeql-action/init@v3
@@ -61,9 +87,14 @@ jobs:
 
             # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
             # If this step fails, then you should remove it and run the build manually (see below)
-            - name: Autobuild
+            - name: Autobuild (not Go)
+              if: matrix.language != 'go'
               uses: github/codeql-action/autobuild@v3
 
+            - name: Build (Go only)
+              if: matrix.language == 'go'
+              run: scripthaus run build-backend
+
             # ℹ️ Command-line programs to run using the OS shell.
             # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 

assets/default-keybindings.json

@@ -3,6 +3,10 @@
       "command": "system:toggleDeveloperTools",
       "keys": ["Cmd:Option:i"]
     },
+    {
+      "command": "system:hideWindow",
+      "keys": ["Cmd:m"]
+    },
     {
       "command": "generic:cancel",
       "keys": ["Escape"]
@@ -32,7 +36,7 @@
       "keys": ["PageDown"]
     },
     {
-      "command": "app:openHistory",
+      "command": "app:openHistoryView",
       "keys": ["Cmd:h"]
     },
     {
@@ -41,11 +45,13 @@
     },
     {
       "command": "app:openConnectionsView", 
-      "keys": []
+      "keys": [],
+      "commandStr": "/mainview connections"
     },
     {
       "command": "app:openSettingsView", 
-      "keys": []
+      "keys": [],
+      "commandStr": "/mainview clientsettings"
     },
     {
       "command": "app:newTab",
@@ -125,39 +131,48 @@
     },
     {
       "command": "app:selectWorkspace-1",
-      "keys": ["Cmd:Ctrl:1"]
+      "keys": ["Cmd:Ctrl:1"],
+      "commandStr": "/session 1"
     },
     {
       "command": "app:selectWorkspace-2",
-      "keys": ["Cmd:Ctrl:2"]
+      "keys": ["Cmd:Ctrl:2"],
+      "commandStr": "/session 2"
     },
     {
       "command": "app:selectWorkspace-3",
-      "keys": ["Cmd:Ctrl:3"]
+      "keys": ["Cmd:Ctrl:3"],
+      "commandStr": "/session 3"
     },
     {
       "command": "app:selectWorkspace-4",
-      "keys": ["Cmd:Ctrl:4"]
+      "keys": ["Cmd:Ctrl:4"],
+      "commandStr": "/session 4"
     },
     {
       "command": "app:selectWorkspace-5",
-      "keys": ["Cmd:Ctrl:5"]
+      "keys": ["Cmd:Ctrl:5"],
+      "commandStr": "/session 5"
     },
     {
       "command": "app:selectWorkspace-6",
-      "keys": ["Cmd:Ctrl:6"]
+      "keys": ["Cmd:Ctrl:6"],
+      "commandStr": "/session 6"
     },
     {
       "command": "app:selectWorkspace-7",
-      "keys": ["Cmd:Ctrl:7"]
+      "keys": ["Cmd:Ctrl:7"],
+      "commandStr": "/session 7"
     },
     {
       "command": "app:selectWorkspace-8",
-      "keys": ["Cmd:Ctrl:8"]
+      "keys": ["Cmd:Ctrl:8"],
+      "commandStr": "/session 8"
     },
     {
       "command": "app:selectWorkspace-9",
-      "keys": ["Cmd:Ctrl:9"]
+      "keys": ["Cmd:Ctrl:9"],
+      "commandStr": "/session 9"
     },
     {
       "command": "app:toggleSidebar",
@@ -168,8 +183,9 @@
       "keys": ["Cmd:d"]
     },
     {
-      "command": "app:bookmarkActiveLine",
-      "keys": ["Cmd:b"]
+      "command": "app:openBookmarksView",
+      "keys": ["Cmd:b"],
+      "commandStr": "/bookmarks:show"
     },
     {
       "command": "bookmarks:edit",
@@ -213,7 +229,8 @@
     },
     {
       "command": "cmdinput:openHistory",
-      "keys": ["Ctrl:r"]
+      "keys": ["Ctrl:r"],
+      "commandStr": "/history"
     },
     {
       "command": "cmdinput:openAIChat",

public/themes/default.css

@@ -220,6 +220,4 @@
     --modal-header-bottom-border-color: rgba(241, 246, 243, 0.15);
 
     --logo-button-hover-bg-color: #1e1e1e;
-
-    --xterm-viewport-border-color: rgba(241, 246, 243, 0.15);
 }

public/themes/light.css

@@ -74,6 +74,4 @@
     --toggle-thumb-color: var(--app-bg-color);
 
     --logo-button-hover-bg-color: #f0f0f0;
-
-    --xterm-viewport-border-color: rgba(0, 0, 0, 0.3);
 }

public/themes/term-default.css

@@ -3,7 +3,7 @@
 
 :root {
     /* 
-     * term colors (16 + 2) form the base terminal theme 
+     * term colors (16 + 6) form the base terminal theme 
      * for consistency these colors should be used by plugins/applications
      */
     --term-black: #000000;
@@ -27,4 +27,6 @@
     --term-cmdtext: #ffffff;
     --term-foreground: #d3d7cf;
     --term-background: #000000;
+    --term-selection-background: #ffffff90;
+    --term-cursor-accent: #000000;
 }

public/themes/term-light.css

@@ -6,4 +6,6 @@
     --term-foreground: #000000;
     --term-background: #fefefe;
     --term-cmdtext: #000000;
+    --term-selection-background: #00000040;
+    --term-cursor-accent: #000000;
 }

src/app/bookmarks/bookmarks.tsx

@@ -193,7 +193,7 @@ class BookmarksView extends React.Component<{}, {}> {
         let bookmarks = GlobalModel.bookmarksModel.bookmarks;
         let bookmark: BookmarkType = null;
         return (
-            <MainView viewName="bookmarks" title="Bookmarks" onClose={this.handleClose}>
+            <MainView className="bookmarks-view" title="Bookmarks" onClose={this.handleClose}>
                 <div className="bookmarks-list">
                     <For index="idx" each="bookmark" of={bookmarks}>
                         <Bookmark key={bookmark.bookmarkid} bookmark={bookmark} />

src/app/clientsettings/clientsettings.tsx

@@ -87,6 +87,7 @@ class ClientSettingsView extends React.Component<{ model: RemotesModel }, { hove
         const availableFontFamilies: DropdownItem[] = [];
         availableFontFamilies.push({ label: "JetBrains Mono", value: "JetBrains Mono" });
         availableFontFamilies.push({ label: "Hack", value: "Hack" });
+        availableFontFamilies.push({ label: "Fira Code", value: "Fira Code" });
         return availableFontFamilies;
     }
 

src/app/common/modals/alert.tsx

@@ -44,7 +44,7 @@ class AlertModal extends React.Component<{}, {}> {
                         <Markdown text={message?.message ?? ""} extraClassName="bottom-margin" />
                     </If>
                     <If condition={!message?.markdown}>{message?.message}</If>
-                    <If condition={message.confirmflag}>
+                    <If condition={message?.confirmflag}>
                         <Checkbox
                             onChange={this.handleDontShowAgain}
                             label={"Don't show me this again"}

src/app/common/modals/userinput.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { GlobalModel } from "@/models";
 import { Choose, When, If } from "tsx-control-statements/components";
-import { Modal, PasswordField, Markdown, Checkbox } from "@/elements";
+import { Modal, PasswordField, TextField, Markdown, Checkbox } from "@/elements";
 import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "@/util/keyutil";
 
 import "./userinput.less";
@@ -82,8 +82,17 @@ export const UserInputModal = (userInputRequest: UserInputRequest) => {
                         </If>
                         <If condition={!userInputRequest.markdown}>{userInputRequest.querytext}</If>
                     </div>
-                    <Choose>
-                        <When condition={userInputRequest.responsetype == "text"}>
+                    <If condition={userInputRequest.responsetype == "text"}>
+                        <If condition={userInputRequest.publictext}>
+                            <TextField
+                                onChange={setResponseText}
+                                value={responseText}
+                                maxLength={400}
+                                autoFocus={true}
+                                onKeyDown={(e) => handleTextKeyDown(e)}
+                            />
+                        </If>
+                        <If condition={!userInputRequest.publictext}>
                             <PasswordField
                                 onChange={setResponseText}
                                 value={responseText}
@@ -91,8 +100,8 @@ export const UserInputModal = (userInputRequest: UserInputRequest) => {
                                 autoFocus={true}
                                 onKeyDown={(e) => handleTextKeyDown(e)}
                             />
-                        </When>
-                    </Choose>
+                        </If>
+                    </If>
                 </div>
                 <If condition={userInputRequest.checkboxmsg != ""}>
                     <Checkbox

src/app/common/modals/viewremoteconndetail.less

@@ -90,25 +90,12 @@
                     margin-top: 5px;
                     overflow-x: auto;
                     overflow-y: hidden;
+                    border: 1px solid var(--app-border-color);
+                    border-radius: 6px;
+                    padding: 6px 10px;
 
                     .terminal-connectelem {
                         height: 163px !important; // Needed to override plugin height
-
-                        .xterm-viewport {
-                            display: flex;
-                            padding: 6px 10px;
-                            gap: 8px;
-                            align-items: flex-start;
-                            align-self: stretch;
-                            border-radius: 6px;
-                            border: 1px solid var(--xterm-viewport-border-color);
-                            background: #080a08;
-                            height: 163px !important; // Needed to override plugin height
-                        }
-
-                        .xterm-screen {
-                            padding: 10px;
-                        }
                     }
                 }
             }

src/app/line/line.less

@@ -126,6 +126,7 @@
 
     &:hover .line-actions {
         background-color: var(--line-actions-bg-color);
+        backdrop-filter: blur(8px);
         .line-icon {
             visibility: visible;
         }

src/app/line/renderer/basicrenderer.tsx

@@ -1,276 +0,0 @@
-// Copyright 2023, Command Line Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-import * as React from "react";
-import * as mobxReact from "mobx-react";
-import * as mobx from "mobx";
-
-import { debounce } from "throttle-debounce";
-import * as util from "@/util/util";
-import { GlobalModel } from "@/models";
-
-class SimpleBlobRendererModel {
-    context: RendererContext;
-    opts: RendererOpts;
-    isDone: OV<boolean>;
-    api: RendererModelContainerApi;
-    savedHeight: number;
-    loading: OV<boolean>;
-    loadError: OV<string> = mobx.observable.box(null, {
-        name: "renderer-loadError",
-    });
-    lineState: LineStateType;
-    ptyData: PtyDataType;
-    ptyDataSource: (termContext: TermContextUnion) => Promise<PtyDataType>;
-    dataBlob: Blob;
-    readOnly: boolean;
-    notFound: boolean;
-
-    initialize(params: RendererModelInitializeParams): void {
-        this.loading = mobx.observable.box(true, { name: "renderer-loading" });
-        this.isDone = mobx.observable.box(params.isDone, {
-            name: "renderer-isDone",
-        });
-        this.context = params.context;
-        this.opts = params.opts;
-        this.api = params.api;
-        this.lineState = params.lineState;
-        this.savedHeight = params.savedHeight;
-        this.ptyDataSource = params.ptyDataSource;
-        if (this.isDone.get()) {
-            setTimeout(() => this.reload(0), 10);
-        }
-    }
-
-    dispose(): void {
-        return;
-    }
-
-    giveFocus(): void {
-        return;
-    }
-
-    updateOpts(update: RendererOptsUpdate): void {
-        Object.assign(this.opts, update);
-    }
-
-    updateHeight(newHeight: number): void {
-        if (this.savedHeight != newHeight) {
-            this.savedHeight = newHeight;
-            this.api.saveHeight(newHeight);
-        }
-    }
-
-    setIsDone(): void {
-        if (this.isDone.get()) {
-            return;
-        }
-        mobx.action(() => {
-            this.isDone.set(true);
-        })();
-        this.reload(0);
-    }
-
-    reload(delayMs: number): void {
-        mobx.action(() => {
-            this.loading.set(true);
-        })();
-        if (delayMs == 0) {
-            this.reload_noDelay();
-        } else {
-            setTimeout(() => {
-                this.reload_noDelay();
-            }, delayMs);
-        }
-    }
-
-    reload_noDelay(): void {
-        let source = this.lineState["prompt:source"] || "pty";
-        if (source == "pty") {
-            this.reloadPtyData();
-        } else if (source == "file") {
-            this.reloadFileData();
-        } else {
-            mobx.action(() => {
-                this.loadError.set("error: invalid load source: " + source);
-            })();
-        }
-    }
-
-    reloadFileData(): void {
-        // todo add file methods to API, so we don't have a GlobalModel dependency here!
-        let path = this.lineState["prompt:file"];
-        if (util.isBlank(path)) {
-            mobx.action(() => {
-                this.loadError.set("renderer has file source, but no prompt:file specified");
-            })();
-            return;
-        }
-        let rtnp = GlobalModel.readRemoteFile(this.context.screenId, this.context.lineId, path);
-        rtnp.then((file) => {
-            this.notFound = (file as any).notFound;
-            this.readOnly = (file as any).readOnly;
-            this.dataBlob = file;
-            mobx.action(() => {
-                this.loading.set(false);
-                this.loadError.set(null);
-            })();
-        }).catch((e) => {
-            mobx.action(() => {
-                this.loadError.set("error loading file data: " + e);
-            })();
-        });
-    }
-
-    reloadPtyData(): void {
-        this.readOnly = true;
-        let rtnp = this.ptyDataSource(this.context);
-        if (rtnp == null) {
-            console.log("no promise returned from ptyDataSource (simplerenderer)", this.context);
-            return;
-        }
-        rtnp.then((ptydata) => {
-            this.ptyData = ptydata;
-            this.dataBlob = new Blob([this.ptyData.data]);
-            mobx.action(() => {
-                this.loading.set(false);
-                this.loadError.set(null);
-            })();
-        }).catch((e) => {
-            mobx.action(() => {
-                this.loadError.set("error loading data: " + e);
-            })();
-        });
-    }
-
-    receiveData(pos: number, data: Uint8Array, reason?: string): void {
-        // this.dataBuf.receiveData(pos, data, reason);
-    }
-}
-
-@mobxReact.observer
-class SimpleBlobRenderer extends React.Component<
-    {
-        rendererContainer: RendererContainerType;
-        lineId: string;
-        plugin: RendererPluginType;
-        onHeightChange: () => void;
-        initParams: RendererModelInitializeParams;
-        scrollToBringIntoViewport: () => void;
-        isSelected: boolean;
-        shouldFocus: boolean;
-    },
-    {}
-> {
-    model: SimpleBlobRendererModel;
-    wrapperDivRef: React.RefObject<any> = React.createRef();
-    rszObs: ResizeObserver;
-    updateHeight_debounced: (newHeight: number) => void;
-
-    constructor(props: any) {
-        super(props);
-        let { rendererContainer, lineId, plugin, initParams } = this.props;
-        this.model = new SimpleBlobRendererModel();
-        this.model.initialize(initParams);
-        rendererContainer.registerRenderer(lineId, this.model);
-        this.updateHeight_debounced = debounce(1000, this.updateHeight.bind(this));
-    }
-
-    updateHeight(newHeight: number): void {
-        this.model.updateHeight(newHeight);
-    }
-
-    handleResize(entries: ResizeObserverEntry[]): void {
-        if (this.model.loading.get()) {
-            return;
-        }
-        if (this.props.onHeightChange) {
-            this.props.onHeightChange();
-        }
-        if (!this.model.loading.get() && this.wrapperDivRef.current != null) {
-            let height = this.wrapperDivRef.current.offsetHeight;
-            this.updateHeight_debounced(height);
-        }
-    }
-
-    checkRszObs() {
-        if (this.rszObs != null) {
-            return;
-        }
-        if (this.wrapperDivRef.current == null) {
-            return;
-        }
-        this.rszObs = new ResizeObserver(this.handleResize.bind(this));
-        this.rszObs.observe(this.wrapperDivRef.current);
-    }
-
-    componentDidMount() {
-        this.checkRszObs();
-    }
-
-    componentWillUnmount() {
-        let { rendererContainer, lineId } = this.props;
-        rendererContainer.unloadRenderer(lineId);
-        if (this.rszObs != null) {
-            this.rszObs.disconnect();
-            this.rszObs = null;
-        }
-    }
-
-    componentDidUpdate() {
-        this.checkRszObs();
-    }
-
-    render() {
-        let { plugin } = this.props;
-        let model = this.model;
-        if (model.loadError.get() != null) {
-            let errorText = model.loadError.get();
-            let height = this.model.savedHeight;
-            return (
-                <div ref={this.wrapperDivRef} style={{ minHeight: height, fontSize: model.opts.termFontSize }}>
-                    <div className="load-error-text">ERROR: {errorText}</div>
-                </div>
-            );
-        }
-        if (model.loading.get()) {
-            let height = this.model.savedHeight;
-            return (
-                <div
-                    ref={this.wrapperDivRef}
-                    className="renderer-loading"
-                    style={{ minHeight: height, fontSize: model.opts.termFontSize }}
-                >
-                    loading content <i className="fa fa-ellipsis fa-fade" />
-                </div>
-            );
-        }
-        let Comp = plugin.simpleComponent;
-        if (Comp == null) {
-            <div ref={this.wrapperDivRef}>(no component found in plugin)</div>;
-        }
-        let { festate, cmdstr, exitcode } = this.props.initParams.rawCmd;
-        return (
-            <div ref={this.wrapperDivRef} className="sr-wrapper">
-                <Comp
-                    cwd={festate.cwd}
-                    cmdstr={cmdstr}
-                    exitcode={exitcode}
-                    data={model.dataBlob as ExtBlob}
-                    readOnly={model.readOnly}
-                    notFound={model.notFound}
-                    lineState={model.lineState}
-                    context={model.context}
-                    opts={model.opts}
-                    savedHeight={model.savedHeight}
-                    scrollToBringIntoViewport={this.props.scrollToBringIntoViewport}
-                    isSelected={this.props.isSelected}
-                    shouldFocus={this.props.shouldFocus}
-                    rendererApi={model.api}
-                />
-            </div>
-        );
-    }
-}
-
-export { SimpleBlobRendererModel, SimpleBlobRenderer };

src/electron/emain.ts

@@ -263,7 +263,12 @@ const menuTemplate: Electron.MenuItemConstructorOptions[] = [
             { type: "separator" },
             { role: "services" },
             { type: "separator" },
-            { role: "hide" },
+            {
+                label: "Hide",
+                click: () => {
+                    app.hide();
+                },
+            },
             { role: "hideOthers" },
             { type: "separator" },
             { role: "quit" },
@@ -303,16 +308,21 @@ function shFrameNavHandler(event: Electron.Event<Electron.WebContentsWillFrameNa
         // only use this handler to process iframe events (non-iframe events go to shNavHandler)
         return;
     }
-    event.preventDefault();
     const url = event.url;
     console.log(`frame-navigation url=${url} frame=${event.frame.name}`);
     if (event.frame.name == "webview") {
         // "webview" links always open in new window
         // this will *not* effect the initial load because srcdoc does not count as an electron navigation
         console.log("open external, frameNav", url);
+        event.preventDefault();
         electron.shell.openExternal(url);
         return;
     }
+    if (event.frame.name == "pdfview" && url.startsWith("blob:file:///")) {
+        // allowed
+        return;
+    }
+    event.preventDefault();
     console.log("frame navigation canceled");
 }
 
@@ -513,6 +523,13 @@ electron.ipcMain.on("toggle-developer-tools", (event) => {
     event.returnValue = true;
 });
 
+electron.ipcMain.on("hide-window", (event) => {
+    if (MainWindow != null) {
+        MainWindow.hide();
+    }
+    event.returnValue = true;
+});
+
 electron.ipcMain.on("get-id", (event) => {
     event.returnValue = instanceId + ":" + event.processId;
 });

src/electron/preload.js

@@ -1,6 +1,7 @@
 let { contextBridge, ipcRenderer } = require("electron");
 
 contextBridge.exposeInMainWorld("api", {
+    hideWindow: () => ipc.Renderer.send("hide-window"),
     toggleDeveloperTools: () => ipcRenderer.send("toggle-developer-tools"),
     getId: () => ipcRenderer.sendSync("get-id"),
     getPlatform: () => ipcRenderer.sendSync("get-platform"),

src/models/bookmarks.ts

@@ -206,7 +206,7 @@ class BookmarksModel {
     }
 
     handleDocKeyDown(e: any): void {
-        let waveEvent = adaptFromReactOrNativeKeyEvent(e);
+        const waveEvent = adaptFromReactOrNativeKeyEvent(e);
         if (checkKeyPressed(waveEvent, "Escape")) {
             e.preventDefault();
             if (this.editingBookmark.get() != null) {

src/models/clientsettingsview.ts

@@ -3,6 +3,7 @@
 
 import * as mobx from "mobx";
 import { Model } from "./model";
+import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "@/util/keyutil";
 
 class ClientSettingsViewModel {
     globalModel: Model;
@@ -21,6 +22,15 @@ class ClientSettingsViewModel {
             this.globalModel.activeMainView.set("clientsettings");
         })();
     }
+
+    handleDocKeyDown(e: any): void {
+        const waveEvent = adaptFromReactOrNativeKeyEvent(e);
+        if (checkKeyPressed(waveEvent, "Escape")) {
+            e.preventDefault();
+            this.closeView();
+            return;
+        }
+    }
 }
 
 export { ClientSettingsViewModel };