test using exec property

.github/workflows/build-helper.yml

@@ -16,10 +16,6 @@ jobs:
                       arch: "amd64"
                       runner: "ubuntu-latest"
                       scripthaus: "build-package-linux"
-                    - platform: "linux"
-                      arch: "arm64"
-                      runner: ubuntu-24.04-arm64-16core
-                      scripthaus: "build-package-linux"
         runs-on: ${{ matrix.runner }}
         steps:
             - uses: actions/checkout@v4
@@ -31,9 +27,7 @@ jobs:
               if: matrix.platform == 'linux'
               run: |
                   sudo apt-get update
-                  sudo apt-get install --no-install-recommends -y libarchive-tools libopenjp2-tools rpm
-            - name: Install FPM # The version of FPM that comes bundled with electron-builder doesn't include a Linux ARM target. Installing Gems onto the runner is super quick so we'll just do this for all targets.
-              run: sudo gem install fpm
+                  sudo apt-get install --no-install-recommends -y libarchive-tools libopenjp2-tools rpm snapcraft snapd
             - uses: actions/setup-go@v5
               with:
                   go-version: ${{env.GO_VERSION}}
@@ -47,31 +41,28 @@ 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}}
-            - name: Install yarn
-              run: |
-                  corepack enable
-                  yarn install
+                  cache: "yarn"
             - name: Set Version
               id: set-version
               run: |
                   VERSION=$(node -e 'console.log(require("./version.js"))')
                   echo "WAVETERM_VERSION=${VERSION}" >> "$GITHUB_OUTPUT"
+            - 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 }}
-                  USE_SYSTEM_FPM: true # Ensure that the installed version of FPM is used rather than the bundled one.
                   CSC_LINK: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_CERTIFICATE}}
                   CSC_KEY_PASSWORD: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_CERTIFICATE_PWD }}
                   APPLE_ID: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}
                   APPLE_APP_SPECIFIC_PASSWORD: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_NOTARIZATION_PWD }}
                   APPLE_TEAM_ID: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
             - name: Upload to S3 staging
-              run: aws s3 cp make/ s3://waveterm-github-artifacts/staging-legacy/${{ steps.set-version.outputs.WAVETERM_VERSION }}/ --recursive --exclude "*/*" --exclude "builder-*.yml"
+              run: aws s3 cp make/ s3://waveterm-github-artifacts/staging/${{ steps.set-version.outputs.WAVETERM_VERSION }}/ --recursive --exclude "*/*" --exclude "builder-*.yml"
               env:
                   AWS_ACCESS_KEY_ID: "${{ secrets.S3_USERID }}"
                   AWS_SECRET_ACCESS_KEY: "${{ secrets.S3_SECRETKEY }}"

.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
 

.github/workflows/regression.yml

@@ -1,19 +1,13 @@
-name: TestDriver.ai Regression Testing - Waveterm
+name: TestDriver.ai Regression Testing
+
 on:
-    push:
-        branches:
-            - main
-    pull_request:
-        branches:
-            - main
-    schedule:
-        - cron: 0 21 * * *
-    workflow_dispatch: null
-
-permissions:
-    contents: read # To allow the action to read repository contents
-    pull-requests: write # To allow the action to create/update pull request comments
-
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+  schedule:
+    - cron: "0 21 * * *" # every day at 9pm
+  workflow_dispatch:
 
 jobs:
   test:
@@ -22,30 +16,11 @@ jobs:
     steps:
       - uses: dashcamio/testdriver@main
         id: testdriver
+        # note that .testdriver/prerun.sh runs before this, so the app has launched already
         with:
-          version: v3.9.0
-          key: ${{secrets.DASHCAM_API}}
-          os: mac
-          prerun: |
-            cd ~/actions-runner/_work/testdriver/testdriver/
-            brew install go
-            brew tap scripthaus-dev/scripthaus
-            brew install corepack
-            brew install scripthaus
-            corepack enable
-            yarn install
-            scripthaus run build-backend
-            echo "Yarn"
-            yarn
-            echo "Rebuild"
-            scripthaus run electron-rebuild
-            echo "Webpack"
-            scripthaus run webpack-build
-            echo "Starting Electron"
-            scripthaus run electron 1>/dev/null 2>&1 &
-            echo "Electron Done"
-            cd /Users/ec2-user/Downloads/td/
-            npm rebuild
-            exit       
           prompt: |
-            1. /run /Users/ec2-user/actions-runner/_work/testdriver/testdriver/.testdriver/wave1.yml
+            2. click "Continue"
+            2. focus the Wave input with the keyboard shorcut Command + I
+            3. type 'ls' into the input
+            4. press return
+            5. validate Wave shows the result of 'ls'

.gitignore

@@ -22,12 +22,3 @@ test/
 .vscode/
 make/
 waveterm-builds.zip
-
-# Yarn Modern
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions

.testdriver/prerun.sh

@@ -0,0 +1,17 @@
+rm ~/Desktop/WITH-LOVE-FROM-AMERICA.txt
+cd ~/actions-runner/_work/testdriver/testdriver/
+brew install go
+brew tap scripthaus-dev/scripthaus
+brew install scripthaus
+npm install -g yarn
+scripthaus run build-backend
+echo "Yarn"
+yarn
+echo "Rebuild"
+scripthaus run electron-rebuild
+echo "Webpack"
+scripthaus run webpack-build
+echo "Starting Electron"
+scripthaus run electron 1>/dev/null 2>&1 &
+echo "Electron Done"
+exit

.testdriver/wave1.yml

@@ -1,37 +0,0 @@
-version: 3.8.0
-    steps:
-      - prompt: "Focus electron"
-        commands:
-        - command: focus-application
-          name: Electron
-        - command: hover-text
-          description: Get started CTA
-          text: Get Started
-          action: click
-        - command: hover-text
-          description: Settings button
-          text: Settings
-          action: click
-        - command: hover-text
-          description: font size 13
-          text: 13px
-          action: click
-        - command: hover-text
-          description: font size 12
-          text: 12px
-          action: click
-        - command: hover-text
-          description: theme selector
-          text: Dark
-          action: click
-        - command: hover-text
-          description: theme color white
-          text: Light
-          action: click
-        - command: hover-text
-          description: workspace
-          text: workspace-1
-          action: click
-        - command: assert
-          expect: the terminal is white
-

.yarnrc.yml

@@ -1 +0,0 @@
-nodeLinker: node-modules

BUILD.md

@@ -11,43 +11,35 @@ If you install the production version of Wave, you'll see a semi-transparent gra
 
 Download and install Go (must be at least go 1.18):
 
-```sh
+```
 brew install go
 ```
 
 Download and install ScriptHaus (to run the build commands):
 
-```sh
+```
 brew tap scripthaus-dev/scripthaus
 brew install scripthaus
 ```
 
 You also need a relatively modern nodejs with npm and yarn installed.
 
-Node can be installed from [https://nodejs.org](https://nodejs.org).
+-   Node can be installed from [https://nodejs.org](https://nodejs.org).
+-   npm can install yarn using:
 
-We use Yarn Modern to manage our packages. The recommended way to install Yarn Modern is using Corepack, a new utility shipped by NodeJS that lets you manage your package manager versioning as you would any packages.
-
-If you installed NodeJS from the official feed (via the website or using NVM), this should come preinstalled. If you use Homebrew or some other feed, you may need to manually install Corepack using `npm install -g corepack`.
-
-For more information on Corepack, check out [this link](https://yarnpkg.com/corepack).
-
-Once you've verified that you have Corepack installed, run the following script to set up Yarn for the repository:
-
-```sh
-corepack enable
-yarn install
+```
+npm install -g yarn
 ```
 
 ## Clone the Repo
 
-```sh
+```
 git clone git@github.com:wavetermdev/waveterm.git
 ```
 
 ## Building WaveShell / WaveSrv
 
-```sh
+```
 scripthaus run build-backend
 ```
 
@@ -57,7 +49,7 @@ This builds the Golang backends for Wave. The binaries will put in waveshell/bin
 
 Install modules (we use yarn):
 
-```sh
+```
 yarn
 ```
 
@@ -65,7 +57,7 @@ yarn
 
 We use webpack to build both the React and Electron App Wrapper code. They are both run together using:
 
-```sh
+```
 scripthaus run webpack-watch
 ```
 
@@ -73,7 +65,7 @@ scripthaus run webpack-watch
 
 Now that webpack is running (and watching for file changes) we can finally run the WaveTerm Dev Client! To start the client run:
 
-```sh
+```
 scripthaus run electron
 ```
 

README.md

@@ -7,14 +7,8 @@
   <br/>
 </p>
 
-# Wave Legacy
-
-This branch is for the legacy v0.7.7 version of Wave.  For the new Wave v8+ code, please use the main branch.
-
 # Wave Terminal
 
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fwavetermdev%2Fwaveterm.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fwavetermdev%2Fwaveterm?ref=badge_shield)
-
 Wave is an open-source AI-native terminal built for seamless workflows.
 
 Wave isn't just another terminal emulator; it's a rethink on how terminals are built. Wave combines command line with the power of the open web to help veteran CLI users and new developers alike.
@@ -62,7 +56,3 @@ Find more information in our [Contributions Guide](CONTRIBUTING.md), which inclu
 
 -   [Ways to contribute](CONTRIBUTING.md#contributing-to-wave-terminal)
 -   [Contribution guidelines](CONTRIBUTING.md#before-you-start)
-
-## License
-
-Wave Terminal is licensed under the Apache-2.0 License. For more information on our dependencies, see [here](./acknowledgements/README.md).

acknowledgements/README.md

@@ -1,5 +1,20 @@
 # Open-Source Acknowledgements
 
-We make use of many amazing open-source projects to build Wave Terminal. We automatically generate license reports via FOSSA to comply with the license distribution requirements of our dependencies. Below is a summary of the licenses used by our product. For a full report, see [here](https://app.fossa.com/reports/24d13570-624b-4450-8c22-756e513060c9?full=true) (the page may take 20-30s to load).
+We make use of many amazing open-source projects to build Wave Terminal. Here are the links to the latest acknowledgements for each of our components, including license disclaimers for each dependency:
 
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fwavetermdev%2Fwaveterm.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fwavetermdev%2Fwaveterm?ref=badge_large)
+- [Frontend](./disclaimers/frontend.md)
+- [Backend](./disclaimers/backend.md)
+
+## Generating license disclaimers
+
+The license disclaimers for the backend are generated using the [go-licenses](https://github.com/google/go-licenses) tool. We supply a template file ([`go_licenses_report.tpl`](./go_licenses_report.tpl)) to generate a pretty print of the disclaimers for each dependency. This outputs to the file [`backend.md`](./disclaimers/backend.md).
+
+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.
+
+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:
+
+```bash
+scripthaus run generate-license-disclaimers
+```

acknowledgements/go_licenses_report.tpl

@@ -0,0 +1,16 @@
+# Wave Terminal Backend Acknowledgements
+
+The following sets forth attribution notices for third party software that may be contained in portions of the Wave Terminal product.
+{{ range . }}
+## {{ .Name }}
+
+* Name: {{ .Name }}
+* Version: {{ .Version }}
+* License: [{{ .LicenseName }}]({{ .LicenseURL }})
+
+```txt
+{{ .LicenseText }}
+```
+
+-----
+{{ end }}

assets/default-keybindings.json

@@ -1,12 +1,7 @@
 [
     {
       "command": "system:toggleDeveloperTools",
-      "keys": ["Cmd:Option:i"],
-      "info": "Opens the chrome developer tool menu"
-    },
-    {
-      "command": "system:hideWindow",
-      "keys": ["Cmd:m"]
+      "keys": ["Cmd:Option:i"]
     },
     {
       "command": "generic:cancel",
@@ -16,62 +11,10 @@
       "command": "generic:confirm",
       "keys": ["Enter"]
     },
-    {
-      "command": "generic:expandTextInput",
-      "keys": ["Shift:Enter", "Ctrl:Enter"]
-    },
     {
       "command": "generic:deleteItem",
       "keys": ["Backspace", "Delete"]
     },
-    {
-      "command": "generic:space",
-      "keys": ["Space"]
-    },
-    {
-      "command": "generic:tab",
-      "keys": ["Tab"]
-    },
-    {
-      "command": "generic:numpad-0",
-      "keys": ["0"]
-    },
-    {
-      "command": "generic:numpad-1",
-      "keys": ["1"]
-    },
-    {
-      "command": "generic:numpad-2",
-      "keys": ["2"]
-    },
-    {
-      "command": "generic:numpad-3",
-      "keys": ["3"]
-    },
-    {
-      "command": "generic:numpad-4",
-      "keys": ["4"]
-    },
-    {
-      "command": "generic:numpad-5",
-      "keys": ["5"]
-    },
-    {
-      "command": "generic:numpad-6",
-      "keys": ["6"]
-    },
-    {
-      "command": "generic:numpad-7",
-      "keys": ["7"]
-    },
-    {
-      "command": "generic:numpad-8",
-      "keys": ["8"]
-    },
-    {
-      "command": "generic:numpad-9",
-      "keys": ["9"]
-    },
     {
       "command": "generic:selectAbove",
       "keys": ["ArrowUp"]
@@ -80,14 +23,6 @@
       "command": "generic:selectBelow",
       "keys": ["ArrowDown"]
     },
-    {
-      "command": "generic:selectLeft",
-      "keys": ["ArrowLeft"]
-    },
-    {
-      "command": "generic:selectRight",
-      "keys": ["ArrowRight"]
-    },
     {
       "command": "generic:selectPageAbove",
       "keys": ["PageUp"]
@@ -97,7 +32,7 @@
       "keys": ["PageDown"]
     },
     {
-      "command": "app:openHistoryView",
+      "command": "app:openHistory",
       "keys": ["Cmd:h"]
     },
     {
@@ -106,13 +41,11 @@
     },
     {
       "command": "app:openConnectionsView", 
-      "keys": [],
-      "commandStr": ["/mainview connections"]
+      "keys": []
     },
     {
       "command": "app:openSettingsView", 
-      "keys": [],
-      "commandStr": ["/mainview clientsettings"]
+      "keys": []
     },
     {
       "command": "app:newTab",
@@ -128,8 +61,7 @@
     },
     {
       "command": "app:restartCommand",
-      "keys": ["Cmd:r"],
-      "info": "Restarts the command running in the current selected line"
+      "keys": ["Cmd:r"]
     },
     {
       "command": "app:restartLastCommand",
@@ -236,9 +168,8 @@
       "keys": ["Cmd:d"]
     },
     {
-      "command": "app:openBookmarksView",
-      "keys": ["Cmd:b"],
-      "commandStr": ["/bookmarks:show"]
+      "command": "app:bookmarkActiveLine",
+      "keys": ["Cmd:b"]
     },
     {
       "command": "bookmarks:edit",
@@ -282,8 +213,11 @@
     },
     {
       "command": "cmdinput:openHistory",
-      "keys": ["Ctrl:r"],
-      "commandStr": ["/history"]
+      "keys": ["Ctrl:r"]
+    },
+    {
+      "command": "cmdinput:openAIChat",
+      "keys": ["Ctrl:Space"]
     },
     {
       "command": "history:closeHistory",
@@ -328,9 +262,5 @@
     {
       "command": "codeedit:togglePreview",
       "keys": ["Cmd:p"]
-    },
-    {
-      "command": "rightsidebar:toggle",
-      "keys": ["Cmd:Shift:Space"]
     }
   ]

build-linux.md

@@ -34,23 +34,20 @@ You'll now have to move the built `scripthaus` binary to a directory in your pat
 sudo cp scripthaus /usr/local/bin
 ```
 
-## Install nodejs and yarn
+## Install nodejs, npm, and yarn
 
-You also need a relatively modern nodejs with npm and yarn installed.
+We use [nvm](https://github.com/nvm-sh/nvm) to install nodejs on Linux (you can use an alternate installer if you wish). You must have a relatively recent version of node in order to build the terminal. Different distributions and shells will require different setup instructions. These instructions work for Ubuntu 22 using bash (will install node v20.8.1):
 
-Node can be installed from [https://nodejs.org](https://nodejs.org).
+```
+wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash
+source ~/.bashrc
+nvm install v20.8.1
+```
 
-We use Yarn Modern to manage our packages. The recommended way to install Yarn Modern is using Corepack, a new utility shipped by NodeJS that lets you manage your package manager versioning as you would any packages.
+Now we can install yarn:
 
-If you installed NodeJS from the official feed (via the website or using NVM), this should come preinstalled. If you use Homebrew or some other feed, you may need to manually install Corepack using `npm install -g corepack`.
-
-For more information on Corepack, check out [this link](https://yarnpkg.com/corepack).
-
-Once you've verified that you have Corepack installed, run the following script to set up Yarn for the repository:
-
-```sh
-corepack enable
-yarn install
+```
+npm install -g yarn
 ```
 
 ## Clone the Wave Repo

buildres/README.md

@@ -13,7 +13,7 @@ is [`electron-builder.config.js`](../electron-builder.config.js).
 
 This will also sign and notarize the macOS app package.
 
-Once a build is complete, it will be placed in `s3://waveterm-github-artifacts/staging-legacy/<version>`.
+Once a build is complete, it will be placed in `s3://waveterm-github-artifacts/staging/<version>`.
 It can be downloaded for testing using the [`download-staged-artifact.sh`](./download-staged-artifact.sh)
 script. When you are ready to publish the artifacts to the public release feed, use the
 [`publish-from-staging.sh`](./publish-from-staging.sh) script to directly copy the artifacts from

buildres/deprecated/upload-release.sh

@@ -7,7 +7,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 BUILDS_DIR=$SCRIPT_DIR/builds
 TEMP2_DIR=$SCRIPT_DIR/temp2
 
-AUTOUPDATE_RELEASE_PATH="dl.waveterm.dev/releases-legacy"
+AUTOUPDATE_RELEASE_PATH="dl.waveterm.dev/releases"
 
 # Copy the builds to the temp2 directory
 echo "Copying builds to temp2"

buildres/download-staged-artifact.sh

@@ -13,4 +13,4 @@ fi
 DOWNLOAD_DIR=$VERSION-staged
 rm -rf $DOWNLOAD_DIR
 mkdir -p $DOWNLOAD_DIR
-aws s3 cp s3://waveterm-github-artifacts/staging-legacy/$VERSION/ $DOWNLOAD_DIR/ --recursive --profile $AWS_PROFILE
+aws s3 cp s3://waveterm-github-artifacts/staging/$VERSION/ $DOWNLOAD_DIR/ --recursive --profile $AWS_PROFILE

buildres/publish-from-staging.sh

@@ -9,8 +9,8 @@ if [ -z "$VERSION" ]; then
     exit
 fi
 
-ORIGIN="waveterm-github-artifacts/staging-legacy/$VERSION/"
-DESTINATION="dl.waveterm.dev/releases-legacy/"
+ORIGIN="waveterm-github-artifacts/staging/$VERSION/"
+DESTINATION="dl.waveterm.dev/releases/"
 
 OUTPUT=$(aws s3 cp s3://$ORIGIN s3://$DESTINATION --recursive --profile $AWS_PROFILE)
 

electron-builder.config.js

@@ -56,6 +56,7 @@ const config = {
                 arch: "universal",
             },
         ],
+        appId: "dev.commandline.waveterm",
         icon: "public/waveterm.icns",
         category: "public.app-category.developer-tools",
         minimumSystemVersion: "10.15.0",
@@ -70,10 +71,11 @@ const config = {
             .map((f) => path.resolve(f.path, f.name)),
     },
     linux: {
+        appId: "dev.commandline.waveterm",
         executableName: pkg.productName,
         category: "TerminalEmulator",
         icon: "public/waveterm.icns",
-        target: ["zip", "deb", "rpm", "AppImage", "pacman"],
+        target: ["zip", "deb", "rpm", "AppImage", "pacman", "snap"],
         synopsis: pkg.description,
         description: null,
         desktop: {
@@ -86,9 +88,26 @@ const config = {
     appImage: {
         license: "LICENSE",
     },
+    snap: {
+        base: "core20",
+        grade: "stable",
+        confinement: "classic",
+        summary: pkg.productName,
+        title: pkg.productName,
+        description: null,
+        synopsis: pkg.description,
+        allowNativeWayland: true,
+        desktop: {
+            Name: pkg.productName,
+            Comment: pkg.description,
+            Keywords: "developer;terminal;emulator;",
+            category: "Development;Utility;",
+            exec: pkg.productName,
+        },
+    },
     publish: {
         provider: "generic",
-        url: "https://dl.waveterm.dev/releases-legacy",
+        url: "https://dl.waveterm.dev/releases",
     },
 };