cleanup line-height/padding for code blocks

.github/workflows/build-helper.yml

@@ -41,7 +41,6 @@ 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}}
@@ -54,7 +53,7 @@ jobs:
             - name: Install Yarn Dependencies
               run: yarn --frozen-lockfile
             - name: Build ${{ matrix.platform }}/${{ matrix.arch }}
-              run: scripthaus run ${{ matrix.scripthaus }}
+              run: ./scripthaus/scripthaus run ${{ matrix.scripthaus }}
               env:
                   GOARCH: ${{ matrix.arch }}
                   CSC_LINK: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_CERTIFICATE}}

.github/workflows/codeql.yml

@@ -47,32 +47,6 @@ 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
@@ -87,14 +61,9 @@ 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 (not Go)
-              if: matrix.language != 'go'
+            - name: Autobuild
               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
 

BUILD.md

@@ -53,6 +53,12 @@ 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.png)
+![WaveTerm Screenshot](./assets/wave-screenshot.jpeg)
 
 ## Installation
 

acknowledgements/README.md

@@ -11,9 +11,9 @@ The license disclaimers for the backend are generated using the [go-licenses](ht
 
 The license disclaimers for the frontend are generated using the [`yarn licenses` tool](https://classic.yarnpkg.com/lang/en/docs/cli/licenses/). This outputs to the file [`frontend.md`](./disclaimers/frontend.md).
 
-These disclaimer files linked above will be periodically regenerated to reflect new dependencies.
+These three disclaimer files linked above will be periodically regenerated to reflect new dependencies.
 
-The [`scripthaus.md` file](../scripthaus.md) contains scripts to generate the disclaimers and package them. To manually generate the disclaimers, run the following from the repository root directory:
+The [`scripthaus.md` file](../scripthaus.md) contains scripts to genrate the disclaimers and package them. To manually generate the disclaimers, run the following from the repository root directory:
 
 ```bash
 scripthaus run generate-license-disclaimers

assets/keybindings.json

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

public/themes/default.css

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

public/themes/term-light.css

@@ -6,6 +6,4 @@
     --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 className="bookmarks-view" title="Bookmarks" onClose={this.handleClose}>
+            <MainView viewName="bookmarks" 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,7 +87,6 @@ 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, TextField, Markdown, Checkbox } from "@/elements";
+import { Modal, PasswordField, Markdown, Checkbox } from "@/elements";
 import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "@/util/keyutil";
 
 import "./userinput.less";
@@ -82,17 +82,8 @@ export const UserInputModal = (userInputRequest: UserInputRequest) => {
                         </If>
                         <If condition={!userInputRequest.markdown}>{userInputRequest.querytext}</If>
                     </div>
-                    <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}>
+                    <Choose>
+                        <When condition={userInputRequest.responsetype == "text"}>
                             <PasswordField
                                 onChange={setResponseText}
                                 value={responseText}
@@ -100,8 +91,8 @@ export const UserInputModal = (userInputRequest: UserInputRequest) => {
                                 autoFocus={true}
                                 onKeyDown={(e) => handleTextKeyDown(e)}
                             />
-                        </If>
-                    </If>
+                        </When>
+                    </Choose>
                 </div>
                 <If condition={userInputRequest.checkboxmsg != ""}>
                     <Checkbox