fix: split the apple locale on the region for LANG

We use AppleLocale to get the desired language when running on macos.
Unfortunately, if a region is set, the locale is not equivalent to the
LANG environment variable. It appends an extra region field that we did
not previously filter out. This change ensures that it will be filtered
out when present.

.github/workflows/publish.yml

@@ -1,23 +0,0 @@
-name: Publish a new release
-on:
-    release:
-        types: [published]
-jobs:
-    build:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-            - name: Get the version
-              id: get_version
-              run: |
-                  VERSION=$(node -e 'console.log(require("./version.js"))')
-                  echo "WAVETERM_VERSION=${VERSION}" >> "$GITHUB_OUTPUT"
-            - name: Copy staged artifacts to the release bucket
-              run: |
-                  . ./buildres/publish-from-staging.sh
-              env:
-                  AWS_ACCESS_KEY_ID: "${{ secrets.S3_USERID }}"
-                  AWS_SECRET_ACCESS_KEY: "${{ secrets.S3_SECRETKEY }}"
-                  AWS_DEFAULT_REGION: us-west-2
-            - name: Publish to Ubuntu PPA

BUILD.md

@@ -53,12 +53,6 @@ Install modules (we use yarn):
 yarn
 ```
 
-Electron also requires specific builds of node_modules to work (because Electron embeds a specific node.js version that might not match your development node.js version). We use a special electron command to cross-compile those modules:
-
-```
-scripthaus run electron-rebuild
-```
-
 ## Running WebPack
 
 We use webpack to build both the React and Electron App Wrapper code. They are both run together using:

README.md

@@ -20,7 +20,7 @@ Wave isn't just another terminal emulator; it's a rethink on how terminals are b
 -   CodeEdit, to edit local and remote files with a VSCode-like inline editor
 -   AI Integration with ChatGPT (or ChatGPT compatible APIs) to help write commands and get answers inline
 
-![WaveTerm Screenshot](./assets/wave-screenshot.jpeg)
+![WaveTerm Screenshot](./assets/wave-screenshot.png)
 
 ## Installation
 

assets/default-keybindings.json

@@ -39,6 +39,14 @@
       "command": "app:openTabSearchModal",
       "keys": ["Cmd:p"]
     },
+    {
+      "command": "app:openConnectionsView", 
+      "keys": []
+    },
+    {
+      "command": "app:openSettingsView", 
+      "keys": []
+    },
     {
       "command": "app:newTab",
       "keys": ["Cmd:t"]

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/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/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/electron/emain.ts

@@ -355,13 +355,6 @@ function createMainWindow(clientData: ClientDataType | null): Electron.BrowserWi
             e.preventDefault();
             return;
         }
-        if (checkKeyPressed(waveEvent, "Cmd:i")) {
-            e.preventDefault();
-            if (!input.alt) {
-                win.webContents.send("i-cmd", mods);
-            }
-            return;
-        }
         if (checkKeyPressed(waveEvent, "Cmd:r")) {
             e.preventDefault();
             win.webContents.send("r-cmd", mods);
@@ -377,16 +370,6 @@ function createMainWindow(clientData: ClientDataType | null): Electron.BrowserWi
             win.webContents.send("w-cmd", mods);
             return;
         }
-        if (checkKeyPressed(waveEvent, "Cmd:h")) {
-            win.webContents.send("h-cmd", mods);
-            e.preventDefault();
-            return;
-        }
-        if (checkKeyPressed(waveEvent, "Cmd:p")) {
-            win.webContents.send("p-cmd", mods);
-            e.preventDefault();
-            return;
-        }
         if (checkKeyPressed(waveEvent, "Cmd:ArrowUp") || checkKeyPressed(waveEvent, "Cmd:ArrowDown")) {
             if (checkKeyPressed(waveEvent, "Cmd:ArrowUp")) {
                 win.webContents.send("meta-arrowup");
@@ -405,7 +388,7 @@ function createMainWindow(clientData: ClientDataType | null): Electron.BrowserWi
             e.preventDefault();
             return;
         }
-        if (input.code.startsWith("Digit") && input.meta) {
+        if (input.code.startsWith("Digit") && input.meta && !input.control) {
             const digitNum = parseInt(input.code.substring(5));
             if (isNaN(digitNum) || digitNum < 1 || digitNum > 9) {
                 return;

src/electron/preload.js

@@ -21,11 +21,8 @@ contextBridge.exposeInMainWorld("api", {
     getAppUpdateStatus: () => ipcRenderer.sendSync("get-app-update-status"),
     onAppUpdateStatus: (callback) => ipcRenderer.on("app-update-status", (_, val) => callback(val)),
     onTCmd: (callback) => ipcRenderer.on("t-cmd", callback),
-    onICmd: (callback) => ipcRenderer.on("i-cmd", callback),
     onLCmd: (callback) => ipcRenderer.on("l-cmd", callback),
-    onHCmd: (callback) => ipcRenderer.on("h-cmd", callback),
     onWCmd: (callback) => ipcRenderer.on("w-cmd", callback),
-    onPCmd: (callback) => ipcRenderer.on("p-cmd", callback),
     onRCmd: (callback) => ipcRenderer.on("r-cmd", callback),
     onZoomChanged: (callback) => ipcRenderer.on("zoom-changed", callback),
     onMetaArrowUp: (callback) => ipcRenderer.on("meta-arrowup", callback),

src/models/model.ts

@@ -146,6 +146,7 @@ class Model {
         this.keybindManager = new KeybindManager();
         this.readConfigKeybindings();
         this.initSystemKeybindings();
+        this.initAppKeybindings();
         this.inputModel = new InputModel(this);
         this.pluginsModel = new PluginsModel(this);
         this.bookmarksModel = new BookmarksModel(this);
@@ -175,10 +176,7 @@ class Model {
             return fontSize;
         });
         getApi().onTCmd(this.onTCmd.bind(this));
-        getApi().onICmd(this.onICmd.bind(this));
         getApi().onLCmd(this.onLCmd.bind(this));
-        getApi().onHCmd(this.onHCmd.bind(this));
-        getApi().onPCmd(this.onPCmd.bind(this));
         getApi().onWCmd(this.onWCmd.bind(this));
         getApi().onRCmd(this.onRCmd.bind(this));
         getApi().onZoomChanged(this.onZoomChanged.bind(this));
@@ -220,12 +218,49 @@ class Model {
     }
 
     initSystemKeybindings() {
-        this.keybindManager.registerKeybinding("system", "electron", "any", (waveEvent) => {
-            if (this.keybindManager.checkKeyPressed(waveEvent, "system:toggleDeveloperTools")) {
-                getApi().toggleDeveloperTools();
+        this.keybindManager.registerKeybinding("system", "electron", "system:toggleDeveloperTools", (waveEvent) => {
+            getApi().toggleDeveloperTools();
+            return true;
+        });
+    }
+
+    initAppKeybindings() {
+        for (let index = 1; index <= 9; index++) {
+            this.keybindManager.registerKeybinding("app", "model", "app:selectWorkspace-" + index, (waveEvent) => {
+                this.onSwitchSessionCmd(index);
                 return true;
-            }
-            return false;
+            });
+        }
+
+        this.keybindManager.registerKeybinding("app", "model", "app:focusCmdInput", (waveEvent) => {
+            console.log("focus cmd input callback");
+            this.onFocusCmdInputPressed();
+            return true;
+        });
+
+        this.keybindManager.registerKeybinding("app", "model", "app:bookmarkActiveLine", (waveEvent) => {
+            this.onBookmarkViewPressed();
+            return true;
+        });
+
+        this.keybindManager.registerKeybinding("app", "model", "app:openHistory", (waveEvent) => {
+            this.onOpenHistoryPressed();
+            return true;
+        });
+
+        this.keybindManager.registerKeybinding("app", "model", "app:openTabSearchModal", (waveEvent) => {
+            this.onOpenTabSearchModalPressed();
+            return true;
+        });
+
+        this.keybindManager.registerKeybinding("app", "model", "app:openConnectionsView", (waveEvent) => {
+            this.onOpenConnectionsViewPressed();
+            return true;
+        });
+
+        this.keybindManager.registerKeybinding("app", "model", "app:openSettingsView", (waveEvent) => {
+            this.onOpenSettingsViewPressed();
+            return true;
         });
     }
 
@@ -470,56 +505,49 @@ class Model {
         }
         if (this.activeMainView.get() == "bookmarks") {
             this.bookmarksModel.handleDocKeyDown(e);
-            return;
         }
         if (this.activeMainView.get() == "history") {
             this.historyViewModel.handleDocKeyDown(e);
-            return;
         }
         if (this.activeMainView.get() == "connections") {
             this.historyViewModel.handleDocKeyDown(e);
-            return;
         }
         if (this.activeMainView.get() == "clientsettings") {
             this.historyViewModel.handleDocKeyDown(e);
-            return;
-        }
-        if (checkKeyPressed(waveEvent, "Escape")) {
-            e.preventDefault();
-            if (this.activeMainView.get() == "webshare") {
-                this.showSessionView();
+        } else {
+            if (checkKeyPressed(waveEvent, "Escape")) {
+                e.preventDefault();
+                if (this.activeMainView.get() == "webshare") {
+                    this.showSessionView();
+                    return;
+                }
+                if (this.clearModals()) {
+                    return;
+                }
+                const inputModel = this.inputModel;
+                inputModel.toggleInfoMsg();
+                if (inputModel.inputMode.get() != null) {
+                    inputModel.resetInputMode();
+                }
                 return;
             }
-            if (this.clearModals()) {
-                return;
-            }
-            const inputModel = this.inputModel;
-            inputModel.toggleInfoMsg();
-            if (inputModel.inputMode.get() != null) {
-                inputModel.resetInputMode();
-            }
-            return;
-        }
-        if (checkKeyPressed(waveEvent, "Cmd:b")) {
-            e.preventDefault();
-            GlobalCommandRunner.bookmarksView();
-        }
-        if (this.activeMainView.get() == "session" && checkKeyPressed(waveEvent, "Cmd:Ctrl:s")) {
-            e.preventDefault();
-            const activeScreen = this.getActiveScreen();
-            if (activeScreen != null) {
-                const isSidebarOpen = activeScreen.isSidebarOpen();
-                if (isSidebarOpen) {
-                    GlobalCommandRunner.screenSidebarClose();
-                } else {
-                    GlobalCommandRunner.screenSidebarOpen();
+            if (this.activeMainView.get() == "session" && checkKeyPressed(waveEvent, "Cmd:Ctrl:s")) {
+                e.preventDefault();
+                const activeScreen = this.getActiveScreen();
+                if (activeScreen != null) {
+                    const isSidebarOpen = activeScreen.isSidebarOpen();
+                    if (isSidebarOpen) {
+                        GlobalCommandRunner.screenSidebarClose();
+                    } else {
+                        GlobalCommandRunner.screenSidebarOpen();
+                    }
                 }
             }
-        }
-        if (checkKeyPressed(waveEvent, "Cmd:d")) {
-            const ranDelete = this.deleteActiveLine();
-            if (ranDelete) {
-                e.preventDefault();
+            if (checkKeyPressed(waveEvent, "Cmd:d")) {
+                const ranDelete = this.deleteActiveLine();
+                if (ranDelete) {
+                    e.preventDefault();
+                }
             }
         }
         this.keybindManager.processKeyEvent(e, waveEvent);
@@ -719,8 +747,22 @@ class Model {
         GlobalCommandRunner.createNewScreen();
     }
 
-    onICmd(e: any, mods: KeyModsType) {
-        this.inputModel.giveFocus();
+    onBookmarkViewPressed() {
+        GlobalCommandRunner.bookmarksView();
+    }
+
+    onFocusCmdInputPressed() {
+        if (this.activeMainView.get() != "session") {
+            mobx.action(() => {
+                this.activeMainView.set("session");
+                setTimeout(() => {
+                    // allows for the session view to load
+                    this.inputModel.giveFocus();
+                }, 100);
+            })();
+        } else {
+            this.inputModel.giveFocus();
+        }
     }
 
     onLCmd(e: any, mods: KeyModsType) {
@@ -730,14 +772,22 @@ class Model {
         }
     }
 
-    onHCmd(e: any, mods: KeyModsType) {
+    onOpenHistoryPressed() {
         this.historyViewModel.reSearch();
     }
 
-    onPCmd(e: any, mods: KeyModsType) {
+    onOpenTabSearchModalPressed() {
         this.modalsModel.pushModal(appconst.TAB_SWITCHER);
     }
 
+    onOpenConnectionsViewPressed() {
+        this.activeMainView.set("connections");
+    }
+
+    onOpenSettingsViewPressed() {
+        this.activeMainView.set("clientsettings");
+    }
+
     getFocusedLine(): LineFocusType {
         if (this.inputModel.hasFocus()) {
             return { cmdInputFocus: true };
@@ -804,11 +854,12 @@ class Model {
         }
     }
 
+    onSwitchSessionCmd(digit: number) {
+        console.log("switching to ", digit);
+        GlobalCommandRunner.switchSession(String(digit));
+    }
+
     onDigitCmd(e: any, arg: { digit: number }, mods: KeyModsType) {
-        if (mods.meta && mods.ctrl) {
-            GlobalCommandRunner.switchSession(String(arg.digit));
-            return;
-        }
         GlobalCommandRunner.switchScreen(String(arg.digit));
     }
 

src/plugins/image/image.less

@@ -1,4 +1,10 @@
 .image-renderer {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    padding-top: var(--termpad);
+
     img {
         display: block;
     }

src/plugins/terminal/term.ts

@@ -57,6 +57,10 @@ function getThemeFromCSSVars(): ITheme {
     theme.brightMagenta = rootStyle.getPropertyValue("--term-bright-magenta");
     theme.brightCyan = rootStyle.getPropertyValue("--term-bright-cyan");
     theme.brightWhite = rootStyle.getPropertyValue("--term-bright-white");
+    theme.selectionBackground = rootStyle.getPropertyValue("--term-selection-background");
+    theme.selectionInactiveBackground = rootStyle.getPropertyValue("--term-selection-background");
+    theme.cursor = rootStyle.getPropertyValue("--term-selection-background");
+    theme.cursorAccent = rootStyle.getPropertyValue("--term-cursor-accent");
     return theme;
 }
 

src/types/custom.d.ts

@@ -896,10 +896,7 @@ declare global {
         getAppUpdateStatus: () => AppUpdateStatusType;
         onAppUpdateStatus: (callback: (status: AppUpdateStatusType) => void) => void;
         onTCmd: (callback: (mods: KeyModsType) => void) => void;
-        onICmd: (callback: (mods: KeyModsType) => void) => void;
         onLCmd: (callback: (mods: KeyModsType) => void) => void;
-        onHCmd: (callback: (mods: KeyModsType) => void) => void;
-        onPCmd: (callback: (mods: KeyModsType) => void) => void;
         onRCmd: (callback: (mods: KeyModsType) => void) => void;
         onWCmd: (callback: (mods: KeyModsType) => void) => void;
         onZoomChanged: (callback: () => void) => void;