feat: first pass at sftp installer for waveshell

This does not completely work yet. In particular, you must attempt to connect to the client before attempting an install. It also does not work for auto installation yet.
2026-04-22 15:26:58 -07:00 · 2024-02-15 19:06:14 -08:00
164 changed files with 8779 additions and 4430 deletions
@@ -1,48 +1,76 @@
 name: "Build Helper"
 on: workflow_dispatch
 env:
+    WAVETERM_VERSION: 0.6.1
    GO_VERSION: "1.21.5"
    NODE_VERSION: "21.5.0"
 jobs:
-    runbuild:
-        outputs:
-            WAVETERM_VERSION: ${{ steps.set-version.outputs.WAVETERM_VERSION }}
-        strategy:
-            matrix:
-                include:
-                    - platform: "darwin"
-                      arch: "universal"
-                      runner: "macos-latest-xlarge"
-                      scripthaus: "build-package"
-                    - platform: "linux"
-                      arch: "arm64"
-                      runner: "ubuntu-latest"
-                      scripthaus: "build-package-linux"
-                    - platform: "linux"
-                      arch: "amd64"
-                      runner: "ubuntu-latest"
-                      scripthaus: "build-package-linux"
-        runs-on: ${{ matrix.runner }}
+    runbuild-darwin-x64:
+        name: "Build MacOS x64"
+        runs-on: macos-latest
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-go@v4
+              with:
+                  go-version: ${{env.GO_VERSION}}
+                  cache-dependency-path: |
+                      wavesrv/go.sum
+                      waveshell/go.sum
+            - run: brew tap scripthaus-dev/scripthaus
+            - run: brew install scripthaus
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: ${{env.NODE_VERSION}}
+                  cache: "yarn"
+            - run: yarn --frozen-lockfile
+            - run: scripthaus run build-package
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: waveterm-build-darwin-x64
+                  path: out/make/zip/darwin/x64/*.zip
+                  retention-days: 2
+    runbuild-darwin-arm64:
+        name: "Build MacOS arm64"
+        runs-on: macos-latest-xlarge
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-go@v4
+              with:
+                  go-version: ${{env.GO_VERSION}}
+                  cache-dependency-path: |
+                      wavesrv/go.sum
+                      waveshell/go.sum
+            - run: brew tap scripthaus-dev/scripthaus
+            - run: brew install scripthaus
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: ${{env.NODE_VERSION}}
+                  cache: "yarn"
+            - run: yarn --frozen-lockfile
+            - run: scripthaus run build-package
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: waveterm-build-darwin-arm64
+                  path: out/make/zip/darwin/arm64/*.zip
+                  retention-days: 2
+    runbuild-linux:
+        name: "Build Linux x64"
+        runs-on: ubuntu-latest
+        needs: [runbuild-darwin-x64, runbuild-darwin-arm64]
        steps:
            - uses: actions/checkout@v4
            - uses: actions/checkout@v4
              with:
                  repository: scripthaus-dev/scripthaus
                  path: scripthaus
-            - name: Install Linux Build Dependencies
-              if: matrix.platform == 'linux'
-              run: |
-                  sudo apt-get update
-                  sudo apt-get install rpm flatpak flatpak-builder snapcraft
-            - uses: actions/setup-go@v5
+            - uses: actions/setup-go@v4
              with:
                  go-version: ${{env.GO_VERSION}}
                  cache-dependency-path: |
                      wavesrv/go.sum
                      waveshell/go.sum
                      scripthaus/go.sum
-            - name: Install Scripthaus
-              run: |
+            - run: |
                  go work use ./scripthaus;
                  cd scripthaus;
                  go get ./...;
@@ -51,97 +79,22 @@ jobs:
              with:
                  node-version: ${{env.NODE_VERSION}}
                  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/scripthaus run ${{ matrix.scripthaus }}
-              env:
-                  GOARCH: ${{ matrix.arch }}
-            - uses: actions/upload-artifact@v4
-              with:
-                  name: waveterm-build-${{ matrix.platform }}
-                  path: out/make/*
-                  retention-days: 2
-    runbuild-linux-arm:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v4
-            - uses: actions/checkout@v4
-              with:
-                  repository: scripthaus-dev/scripthaus
-                  path: scripthaus
-            - name: Install Linux Build Dependencies
-              run: |
-                  sudo apt-get update
-                  sudo apt-get install rpm flatpak flatpak-builder snapcraft
-            - uses: actions/setup-go@v5
-              with:
-                  go-version: ${{env.GO_VERSION}}
-                  cache-dependency-path: |
-                      wavesrv/go.sum
-                      waveshell/go.sum
-                      scripthaus/go.sum
-            - name: Install Scripthaus
-              run: |
-                  go work use ./scripthaus;
-                  cd scripthaus;
-                  go get ./...;
-                  CGO_ENABLED=1 go build -o scripthaus cmd/main.go
-            - uses: actions/setup-node@v4
-              with:
-                  node-version: ${{env.NODE_VERSION}}
-                  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 linux/arm64
-              uses: pguyot/arm-runner-action@v2
-              with:
-                  image_additional_mb: 2000
-                  base_image: dietpi:rpi_armv8_bullseye
-                  bind_mount_repository: true
-                  commands: |
-                      sudo apt-get update && sudo apt-get install -y snapd git
-                      sudo snap install --classic go
-                      git clone
-
-            - uses: actions/upload-artifact@v4
-              with:
-                  name: waveterm-build-linux-arm
-                  path: out/make/*
-                  retention-days: 2
-
-    upload:
-        name: "Upload Builds"
-        runs-on: ubuntu-latest
-        needs: [runbuild, runbuild-linux-arm]
-        steps:
+            - run: yarn --frozen-lockfile
+            - run: ./scripthaus/scripthaus run build-package-linux
            - uses: actions/download-artifact@v4
              with:
                  merge-multiple: true
-                  path: download
-            - name: Move builds into buildtemp
-              run: |
-                  mkdir buildtemp
-                  # Will only move over the files, flattening the directory structure
-                  find download -mindepth 2 -type f -exec mv -t buildtemp -i '{}' +
-            - name: Set `version.txt`
-              run: |
-                  echo "${{ needs.runbuild.outputs.WAVETERM_VERSION }}" > buildtemp/version.txt
-            - name: Zip Builds
-              run: (cd buildtemp; zip ../waveterm-builds.zip *)
-            - name: Upload to S3
-              run: aws s3 cp waveterm-builds.zip s3://waveterm-github-artifacts/
+                  path: buildtemp
+            - run: |
+                  mv out/make/zip/linux/x64/Wave-linux-x64-$WAVETERM_VERSION.zip buildtemp/waveterm-linux-x64-v$WAVETERM_VERSION.zip
+            - run: (cd buildtemp; zip ../waveterm-builds.zip *)
+            - run: aws s3 cp waveterm-builds.zip s3://waveterm-github-artifacts/
              env:
                  AWS_ACCESS_KEY_ID: "${{ secrets.S3_USERID }}"
                  AWS_SECRET_ACCESS_KEY: "${{ secrets.S3_SECRETKEY }}"
                  AWS_DEFAULT_REGION: us-west-2
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: waveterm-builds
+                  path: buildtemp
+                  retention-days: 2
@@ -12,69 +12,70 @@
 name: "CodeQL"

 on:
-    push:
-        branches: ["main"]
-    pull_request:
-        branches: ["main"]
-    schedule:
-        - cron: "36 5 * * 5"
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: '36 5 * * 5'

 jobs:
-    analyze:
-        name: Analyze
-        # Runner size impacts CodeQL analysis time. To learn more, please see:
-        #   - https://gh.io/recommended-hardware-resources-for-running-codeql
-        #   - https://gh.io/supported-runners-and-hardware-resources
-        #   - https://gh.io/using-larger-runners
-        # Consider using larger runners for possible analysis time improvements.
-        runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
-        timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
-        permissions:
-            actions: read
-            contents: read
-            security-events: write
+  analyze:
+    name: Analyze
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners
+    # Consider using larger runners for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      actions: read
+      contents: read
+      security-events: write

-        strategy:
-            fail-fast: false
-            matrix:
-                language: ["go", "javascript-typescript"]
-                # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
-                # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
-                # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
-                # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go', 'javascript-typescript' ]
+        # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
+        # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

-        steps:
-            - name: Checkout repository
-              uses: actions/checkout@v4
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3

-            # Initializes the CodeQL tools for scanning.
-            - name: Initialize CodeQL
-              uses: github/codeql-action/init@v3
-              with:
-                  languages: ${{ matrix.language }}
-                  # If you wish to specify custom queries, you can do so here or in a config file.
-                  # By default, queries listed here will override any specified in a config file.
-                  # Prefix the list here with "+" to use these queries and those in the config file.
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.

-                  # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-                  # queries: security-extended,security-and-quality
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality

-            # 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
-              uses: github/codeql-action/autobuild@v3

-            # ℹ️ 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
+    # 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
+      uses: github/codeql-action/autobuild@v3

-            #   If the Autobuild fails above, remove it and uncomment the following three lines.
-            #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+    # ℹ️ 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

-            # - run: |
-            #     echo "Run, Build Application using script"
-            #     ./location_of_script_within_repo/buildscript.sh
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

-            - name: Perform CodeQL Analysis
-              uses: github/codeql-action/analyze@v3
-              with:
-                  category: "/language:${{matrix.language}}"
+    # - run: |
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"
@@ -1,26 +0,0 @@
-name: TestDriver.ai Regression Testing
-
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["main"]
-  schedule:
-    - cron: "0 21 * * *" # every day at 9pm
-  workflow_dispatch:
-
-jobs:
-  test:
-    name: "TestDriver"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dashcamio/testdriver@main
-        id: testdriver
-        # note that .testdriver/prerun.sh runs before this, so the app has launched already
-        with:
-          prompt: |
-            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'
@@ -1,20 +0,0 @@
-rm ~/Desktop/WITH-LOVE-FROM-AMERICA.txt
-brew install go
-brew tap scripthaus-dev/scripthaus
-brew install scripthaus
-npm install -g yarn
-mkdir ~/build
-cd ~/build
-git clone https://github.com/wavetermdev/waveterm.git
-cd waveterm
-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
@@ -1,15 +1,15 @@
 <p align="center">
  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="./assets/waveterm-logo-horizontal-dark.png">
-    <source media="(prefers-color-scheme: light)" srcset="./assets/waveterm-logo-horizontal-light.png">
-    <img alt="Wave Terminal Logo" src="./assets/waveterm-logo-horizontal-light.png" width="240" height="80" style="max-width: 100%;">
+    <source media="(prefers-color-scheme: dark)" srcset="./assets/wave-logo_horizontal-coloronblack.svg">
+    <source media="(prefers-color-scheme: light)" srcset="./assets/wave-logo_horizontal-coloronwhite.svg">
+    <img alt="Wave Terminal Logo" src="./assets/wave-logo_horizontal-coloronwhite.svg" width="352" height="59" style="max-width: 100%;">
  </picture>
  <br/>
 </p>

 # Wave Terminal

-An open-source, cross-platform, AI-integrated, modern terminal for seamless workflows.
+A open-source, cross-platform, AI-integrated, modern terminal 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.

@@ -179,11 +179,11 @@ THE SOFTWARE.

 -----

-## github.com/google/go-github/v59/github
+## github.com/google/go-github/v57/github

-* Name: github.com/google/go-github/v59/github
-* Version: v59.0.0
-* License: [BSD-3-Clause](https://github.com/google/go-github/blob/v59.0.0/LICENSE)
+* Name: github.com/google/go-github/v57/github
+* Version: v57.0.0
+* License: [BSD-3-Clause](https://github.com/google/go-github/blob/v57.0.0/LICENSE)

 ```txt
 Copyright (c) 2013 The go-github AUTHORS. All rights reserved.
@@ -1,3 +1,3 @@
-*/
+temp/
 *.zip
-*.dmg
+*.dmg
@@ -1,24 +0,0 @@
-sudo apt-get update && sudo apt-get install -y snapd git
-sudo snap install --classic go && sudo snap install --classic yarn
-
-rm -rf dist/
-rm -rf bin/
-rm -rf build/
-node_modules/.bin/webpack --env prod
-WAVESRV_VERSION=$(node -e 'console.log(require("./version.js"))')
-WAVESHELL_VERSION=v0.4
-GO_LDFLAGS="-s -w -X main.BuildTime=$(date +'%Y%m%d%H%M')"
-function buildWaveShell {
-    (cd waveshell; CGO_ENABLED=0 GOOS=$1 GOARCH=$2 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-$WAVESHELL_VERSION-$1.$2 main-waveshell.go)
-}
-function buildWaveSrv {
-    # adds -extldflags=-static, *only* on linux (macos does not support fully static binaries) to avoid a glibc dependency
-    (cd wavesrv; CGO_ENABLED=1 GOARCH=$1 go build -tags "osusergo,netgo,sqlite_omit_load_extension" -ldflags "-linkmode 'external' -extldflags=-static $GO_LDFLAGS -X main.WaveVersion=$WAVESRV_VERSION" -o ../bin/wavesrv.$1 ./cmd)
-}
-buildWaveShell darwin amd64
-buildWaveShell darwin arm64
-buildWaveShell linux amd64
-buildWaveShell linux arm64
-buildWaveSrv $GOARCH
-yarn run electron-builder -c electron-builder.config.js -l
-                      
@@ -1,9 +1,9 @@
 const eu = require("@electron/universal");
 const path = require("path");

-const x64Path = path.resolve(__dirname, "temp", "x64", "Wave.app");
-const arm64Path = path.resolve(__dirname, "temp", "arm64", "Wave.app");
-const outPath = path.resolve(__dirname, "temp", "Wave.app");
+let x64Path = path.resolve(__dirname, "temp", "x64", "Wave.app")
+let arm64Path = path.resolve(__dirname, "temp", "arm64", "Wave.app")
+let outPath = path.resolve(__dirname, "temp", "Wave.app")

 console.log("building universal package");
 console.log("x64 path", x64Path);
@@ -1,19 +1,11 @@
 #!/bin/bash
-# This script is used to build the universal app for macOS

-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-rm -f *.zip *.dmg
-ZIP_DIR=$SCRIPT_DIR/zip
-rm -rf $ZIP_DIR
-mkdir $ZIP_DIR
-TEMP_DIR=$SCRIPT_DIR/temp
-rm -rf $TEMP_DIR
-mkdir $TEMP_DIR
-BUILDS_DIR=$SCRIPT_DIR/builds
-rm -rf $BUILDS_DIR
-
-# Download the builds zip
+# assumes we have Wave-darwin-x64-[version].zip and Wave-darwin-arm64-[version].zip in current directory
+VERSION=0.6.1
+rm -rf temp
+rm -rf builds
+mkdir temp
+mkdir temp/x64
 aws s3 cp s3://waveterm-github-artifacts/waveterm-builds.zip .
 BUILDS_ZIP=waveterm-builds.zip
 if ! [ -f $BUILDS_ZIP ]; then
@@ -21,66 +13,40 @@ if ! [ -f $BUILDS_ZIP ]; then
    exit 1;
 fi
 echo "unzipping $BUILDS_ZIP"
-unzip -q $BUILDS_ZIP -d $BUILDS_DIR
-rm $BUILDS_ZIP
-
-# Ensure we have exactly one of each build
-find_build() 
-{
-    local BUILD_DIR=$1
-    local BUILD_PATTERN=$2
-    local BUILD_PATH=$(find $BUILD_DIR -type f -iname "$BUILD_PATTERN")
-    local NUM_MATCHES=$(echo $BUILD_PATH | wc -l)
-    if [ "0" -eq "$NUM_MATCHES" ]; then
-        echo "no $BUILD_NAME found in $BUILD_DIR"
-        exit 1
-    elif [ "1" -lt "$NUM_MATCHES" ]; then
-        echo "multiple $BUILD_NAME found in $BUILD_DIR"
-        exit 1
-    fi
-    echo $BUILD_PATH
-}
-
-X64_ZIP=$(find_build $BUILDS_DIR "Wave-darwin-x64-*.zip")
-ARM64_ZIP=$(find_build $BUILDS_DIR "Wave-darwin-arm64-*.zip")
+unzip -q $BUILDS_ZIP -d builds
+X64_ZIP="builds/Wave-darwin-x64-$VERSION.zip"
+ARM64_ZIP="builds/Wave-darwin-arm64-$VERSION.zip"
+if ! [ -f $X64_ZIP ]; then
+    echo "no $X64_ZIP found";
+    exit 1;
+fi
+if ! [ -f $ARM64_ZIP ]; then
+    echo "no $ARM64_ZIP found"
+    exit 1;
+fi
 set -e
-
-echo "unzipping zip files"
-unzip -q $X64_ZIP -d $TEMP_DIR/x64
-unzip -q $ARM64_ZIP -d $TEMP_DIR/arm64
-rm $ARM64_ZIP $X64_ZIP
-
-# Create universal app and sign and notarize it
-TEMP_WAVE_DIR_ARM=$TEMP_DIR/x64/Wave.app
-TEMP_WAVE_DIR_X64=$TEMP_DIR/arm64/Wave.app
-TEMP_WAVE_DIR_UNIVERSAL=$TEMP_DIR/Wave.app
-lipo -create -output $TEMP_DIR/wavesrv $TEMP_WAVE_DIR_X64/Contents/Resources/app/bin/wavesrv $TEMP_WAVE_DIR_ARM/Contents/Resources/app/bin/wavesrv
-rm -rf $TEMP_WAVE_DIR_ARM/Contents/Resources/app
-mv $TEMP_WAVE_DIR_X64/Contents/Resources/app $TEMP_DIR
-cp $TEMP_DIR/wavesrv $TEMP_DIR/app/bin/wavesrv
-mkdir $TEMP_WAVE_DIR_ARM/Contents/Resources/app
-mkdir $TEMP_WAVE_DIR_X64/Contents/Resources/app
-node $SCRIPT_DIR/build-universal.js
-rm -rf $TEMP_WAVE_DIR_UNIVERSAL/Contents/Resources/app
-mv $TEMP_DIR/app $TEMP_WAVE_DIR_UNIVERSAL/Contents/Resources/app
-node $SCRIPT_DIR/osx-sign.js
-DEBUG=electron-notarize node $SCRIPT_DIR/osx-notarize.js
+echo "unzipping version v$VERSION zip files"
+ls -l "$X64_ZIP" "$ARM64_ZIP"
+unzip -q $X64_ZIP -d temp/x64
+mkdir temp/arm64
+unzip -q $ARM64_ZIP -d temp/arm64
+lipo -create -output temp/wavesrv temp/x64/Wave.app/Contents/Resources/app/bin/wavesrv temp/arm64/Wave.app/Contents/Resources/app/bin/wavesrv
+rm -rf temp/arm64/Wave.app/Contents/Resources/app
+mv temp/x64/Wave.app/Contents/Resources/app temp/
+cp temp/wavesrv temp/app/bin/wavesrv
+mkdir temp/x64/Wave.app/Contents/Resources/app
+mkdir temp/arm64/Wave.app/Contents/Resources/app
+node build-universal.js
+rm -rf temp/Wave.app/Contents/Resources/app
+mv temp/app temp/Wave.app/Contents/Resources/app
+node osx-sign.js
+DEBUG=electron-notarize node osx-notarize.js
 echo "universal app creation success (build/sign/notarize)"
-
-UVERSION=$(cat $BUILDS_DIR/version.txt)
-DMG_NAME="waveterm-macos-universal-${UVERSION}.dmg"
-ZIP_NAME="Wave-macos-universal-${UVERSION}.zip"
-
-echo "creating universal zip"
-ditto $TEMP_WAVE_DIR_UNIVERSAL $ZIP_DIR/Wave.app
-cd $ZIP_DIR
-zip -9yqr $ZIP_NAME Wave.app
-mv $ZIP_NAME $BUILDS_DIR/
-cd $SCRIPT_DIR
-
-# Expects create-dmg repo to be cloned in the same parent directory as the waveterm repo.
 echo "creating universal dmg"
-$SCRIPT_DIR/../../create-dmg/create-dmg \
+rm -f *.dmg
+DMG_VERSION=$(node -e 'console.log(require("../version.js"))')
+DMG_NAME="waveterm-macos-universal-${DMG_VERSION}.dmg"
+../../create-dmg/create-dmg \
  --volname "WaveTerm" \
  --window-pos 200 120 \
  --window-size 600 300 \
@@ -89,9 +55,8 @@ $SCRIPT_DIR/../../create-dmg/create-dmg \
  --hide-extension "Wave.app" \
  --app-drop-link 400 125 \
  $DMG_NAME \
-  "$TEMP_WAVE_DIR_UNIVERSAL"
+  "temp/Wave.app"
 echo "success, created $DMG_NAME"
-mv $DMG_NAME $BUILDS_DIR/
-spctl -a -vvv -t install $TEMP_WAVE_DIR_UNIVERSAL/
-
-rm -rf $TEMP_DIR $ZIP_DIR
+mv $DMG_NAME builds/
+rm builds/Wave-darwin-*.zip
+spctl -a -vvv -t install temp/Wave.app/
@@ -1,18 +1,14 @@
-const { notarize } = require("@electron/notarize");
-const path = require("path");
+const { notarize } = require('@electron/notarize');
+// DEBUG=electron-notarize

 console.log("running osx-notarize");
-const waveAppPath = path.resolve(__dirname, "temp", "Wave.app");
-
 notarize({
-    appPath: waveAppPath,
+    appPath: "temp/Wave.app",
    tool: "notarytool",
    keychainProfile: "notarytool-creds",
-})
-    .then(() => {
-        console.log("notarize success");
-    })
-    .catch((e) => {
-        console.log("notarize error", e);
-        process.exit(1);
-    });
+}).then(() => {
+    console.log("notarize success");
+}).catch((e) => {
+    console.log("notarize error", e);
+    process.exit(1);
+});
@@ -1,10 +1,10 @@
 const { signAsync } = require("@electron/osx-sign");
-const path = require("path");
+// DEBUG="electron-osx-sign*"

 console.log("running osx-sign");
-const waveAppPath = path.resolve(__dirname, "temp", "Wave.app");
+let waveAppPath = "temp/Wave.app";
 signAsync({
-    app: waveAppPath,
+    app: "temp/Wave.app",
    binaries: [
        waveAppPath + "/Contents/Resources/app/bin/wavesrv",
        waveAppPath + "/Contents/Resources/app/bin/mshell/mshell-v0.4-linux.amd64",
@@ -12,11 +12,9 @@ signAsync({
        waveAppPath + "/Contents/Resources/app/bin/mshell/mshell-v0.4-darwin.amd64",
        waveAppPath + "/Contents/Resources/app/bin/mshell/mshell-v0.4-darwin.arm64",
    ],
-})
-    .then(() => {
-        console.log("signing success");
-    })
-    .catch((e) => {
-        console.log("signing error", e);
-        process.exit(1);
-    });
+}).then(() => {
+    console.log("signing success");
+}).catch((e) => {
+    console.log("signing error", e);
+    process.exit(1);
+});
@@ -1,86 +0,0 @@
-#!/bin/bash
-# This script is used to upload signed and notarized releases to S3 and update the Electron auto-update release feeds.
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-BUILDS_DIR=$SCRIPT_DIR/builds
-TEMP2_DIR=$SCRIPT_DIR/temp2
-
-MAIN_RELEASE_PATH="dl.waveterm.dev/build"
-AUTOUPDATE_RELEASE_PATH="dl.waveterm.dev/autoupdate"
-
-# Copy the builds to the temp2 directory
-echo "Copying builds to temp2"
-rm -rf $TEMP2_DIR
-mkdir -p $TEMP2_DIR
-cp -r $BUILDS_DIR/* $TEMP2_DIR
-
-UVERSION=$(cat $TEMP2_DIR/version.txt)
-
-if [ -z "$UVERSION" ]; then
-    echo "version.txt is empty"
-    exit 1
-fi
-
-# Find the DMG file
-echo "Finding DMG"
-DMG=$(find $TEMP2_DIR -type f -iname "*.dmg")
-# Ensure there is only one
-NUM_DMGS=$(echo $DMG | wc -l)
-if [ "0" -eq "$NUM_DMGS" ]; then
-    echo "no DMG found in $TEMP2_DIR"
-    exit 1
-elif [ "1" -lt "$NUM_DMGS" ]; then
-    echo "multiple DMGs found in $TEMP2_DIR"
-    exit 1
-fi
-
-# Find the Mac zip
-echo "Finding Mac zip"
-MAC_ZIP=$(find $TEMP2_DIR -type f -iname "*mac*.zip")
-# Ensure there is only one
-NUM_MAC_ZIPS=$(echo $MAC_ZIP | wc -l)
-if [ "0" -eq "$NUM_MAC_ZIPS" ]; then
-    echo "no Mac zip found in $TEMP2_DIR"
-    exit 1
-elif [ "1" -lt "$NUM_MAC_ZIPS" ]; then
-    echo "multiple Mac zips found in $TEMP2_DIR"
-    exit 1
-fi
-
-# Find the Linux zips
-echo "Finding Linux zips"
-LINUX_ZIPS=$(find $TEMP2_DIR -type f -iname "*linux*.zip")
-# Ensure there is at least one
-NUM_LINUX_ZIPS=$(echo $LINUX_ZIPS | wc -l)
-if [ "0" -eq "$NUM_LINUX_ZIPS" ]; then
-    echo "no Linux zips found in $TEMP2_DIR"
-    exit 1
-fi
-
-# Upload the DMG
-echo "Uploading DMG"
-DMG_NAME=$(basename $DMG)
-aws s3 cp $DMG s3:/$MAIN_RELEASE_PATH/$DMG_NAME
-
-# Upload the Linux zips
-echo "Uploading Linux zips"
-for LINUX_ZIP in $LINUX_ZIPS; do
-    LINUX_ZIP_NAME=$(basename $LINUX_ZIP)
-    aws s3 cp $LINUX_ZIP s3://$MAIN_RELEASE_PATH/$LINUX_ZIP_NAME
-done
-
-# Upload the autoupdate Mac zip
-echo "Uploading Mac zip"
-MAC_ZIP_NAME=$(basename $MAC_ZIP)
-aws s3 cp $MAC_ZIP s3://$AUTOUPDATE_RELEASE_PATH/$MAC_ZIP_NAME
-
-# Update the autoupdate feeds
-echo "Updating autoupdate feeds"
-RELEASES_CONTENTS="{\"name\":\"$UVERSION\",\"notes\":\"\",\"url\":\"https://$AUTOUPDATE_RELEASE_PATH/$MAC_ZIP_NAME\"}"
-aws s3 cp - s3://$AUTOUPDATE_RELEASE_PATH/darwin/arm64/RELEASES.json <<< $RELEASES_CONTENTS
-aws s3 cp - s3://$AUTOUPDATE_RELEASE_PATH/darwin/x64/RELEASES.json <<< $RELEASES_CONTENTS
-
-# Clean up
-echo "Cleaning up"
-rm -rf $TEMP2_DIR
@@ -1,71 +0,0 @@
-const pkg = require("./package.json");
-
-/**
- * @type {import('electron-builder').Configuration}
- * @see https://www.electron.build/configuration/configuration
- */
-const config = {
-    artifactName: "${productName}-${version}-${arch}.${ext}",
-    npmRebuild: false,
-    nodeGypRebuild: false,
-    electronCompile: false,
-    publish: null,
-    files: [
-        {
-            from: "./dist",
-            to: "./dist",
-            filter: ["**/*"],
-        },
-        {
-            from: "./public",
-            to: "./public",
-            filter: ["**/*"],
-        },
-        {
-            from: "./bin",
-            to: "./bin",
-            filter: ["**/*"],
-        },
-        {
-            from: ".",
-            to: ".",
-            filter: ["package.json"],
-        },
-        "!**/node_modules/**${/*}", // Ignore node_modules by default
-        {
-            from: "./node_modules",
-            to: "./node_modules",
-            filter: ["monaco-editor/min/**/*"], // This is the only module we want to include
-        },
-    ],
-    directories: {
-        output: "make",
-    },
-    appId: pkg.build.appId,
-    productName: pkg.productName,
-    mac: {
-        target: {
-            target: "zip",
-            arch: "universal",
-        },
-        icon: "public/waveterm.icns",
-        category: "public.app-category.developer-tools",
-        minimumSystemVersion: "10.15.0",
-        asarUnpack: ["bin/**/*"],
-    },
-    linux: {
-        executableName: pkg.productName,
-        category: "TerminalEmulator",
-        icon: "public/waveterm.icns",
-        target: ["zip", "deb"],
-        asar: false,
-        desktop: {
-            Name: pkg.productName,
-            Comment: pkg.description,
-            Keywords: "developer;terminal;emulator;",
-            category: "Development;Utility;",
-        },
-    },
-};
-
-module.exports = config;
@@ -1,5 +1,4 @@
-const pkg = require("./package.json");
-let AllowedFirstParts = {
+var AllowedFirstParts = {
    "package.json": true,
    dist: true,
    public: true,
@@ -7,11 +6,11 @@ let AllowedFirstParts = {
    bin: true,
 };

-let AllowedNodeModules = {
+var AllowedNodeModules = {
    "monaco-editor": true,
 };

-let modCache = {};
+var modCache = {};

 function ignoreFn(path) {
    let parts = path.split("/");
@@ -48,7 +47,11 @@ function ignoreFn(path) {
 module.exports = {
    packagerConfig: {
        ignore: ignoreFn,
-        files: ["package.json", "dist/*", "public/*", "bin/*"],
+        files: [
+            "package.json",
+            "dist/*",
+            "public/*",
+        ],
        icon: "public/waveterm.icns",
    },
    rebuildConfig: {},
@@ -57,59 +60,5 @@ module.exports = {
            name: "@electron-forge/maker-zip",
            platforms: ["darwin", "linux"],
        },
-        {
-            name: "@electron-forge/maker-deb",
-            config: {
-                options: {
-                    bin: pkg.productName,
-                    name: pkg.name,
-                    genericName: "Terminal Emulator",
-                    productName: pkg.productName,
-                    productDescription: pkg.description,
-                    icon: "public/waveterm.icns",
-                    categories: ["Utility", "Development"],
-                    maintainer: pkg.author,
-                    homepage: pkg.homepage,
-                    license: pkg.license,
-                    version: pkg.version,
-                },
-            },
-        },
-        {
-            name: "@electron-forge/maker-rpm",
-            config: {
-                options: {
-                    bin: pkg.productName,
-                    name: pkg.name,
-                    genericName: "Terminal Emulator",
-                    productName: pkg.productName,
-                    description: pkg.description,
-                    productDescription: pkg.description,
-                    icon: "public/waveterm.icns",
-                    categories: ["Utility", "Development"],
-                    license: pkg.license,
-                    version: pkg.version,
-                },
-            },
-        },
-        // {
-        //     name: "@electron-forge/maker-flatpak",
-        //     config: {
-        //         options: {
-        //             bin: pkg.productName,
-        //             mimeType: ["text/plain"],
-        //         },
-        //     },
-        // },
-        // {
-        //     name: "@electron-forge/maker-snap",
-        //     config: {
-        //         features: {
-        //             audio: true,
-        //             mpris: "com.commandline.waveterm",
-        //             webgl: true,
-        //         },
-        //     },
-        // },
    ],
 };
@@ -1,12 +1,45 @@
-github.com/aws/aws-sdk-go-v2/service/s3 v1.27.11 h1:3/gm/JTX9bX8CpzTgIlrtYpB3EVBDxyg/GY/QdcIEZw=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
 github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
+github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
+github.com/pkg/sftp v1.13.6/go.mod h1:tz1ryNURKu77RL+GuCzmoJYxQczL3wLNNpPWagdg4Qk=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/wavetermdev/ssh_config v0.0.0-20240109090616-36c8da3d7376 h1:tFhJgTu7lgd+hldLfPSzDCoWUpXI8wHKR3rxq5jTLkQ=
 github.com/wavetermdev/ssh_config v0.0.0-20240109090616-36c8da3d7376/go.mod h1:q2RIzfka+BXARoNexmF9gkxEX7DmvbW9P4hIVx2Kg4M=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -1,22 +1,10 @@
 {
    "name": "waveterm",
-    "author": {
-        "name": "Command Line Inc",
-        "email": "info@commandline.dev"
-    },
+    "author": "Command Line Inc",
    "productName": "Wave",
-    "description": "An open-source, cross-platform, AI-integrated, modern terminal for seamless workflows.",
    "version": "0.6.1",
    "main": "dist/emain.js",
    "license": "Apache-2.0",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/wavetermdev/waveterm"
-    },
-    "homepage": "https://waveterm.dev",
-    "build": {
-        "appId": "dev.commandline.waveterm"
-    },
    "dependencies": {
        "@monaco-editor/react": "^4.5.1",
        "@table-nav/core": "^0.0.7",
@@ -63,12 +51,12 @@
        "@babel/preset-react": "^7.23.3",
        "@babel/preset-typescript": "^7.17.12",
        "@electron-forge/cli": "^7.2.0",
-        "@electron-forge/maker-deb": "^7.3.0",
-        "@electron-forge/maker-flatpak": "^7.3.0",
-        "@electron-forge/maker-rpm": "^7.3.0",
+        "@electron-forge/maker-deb": "^7.2.0",
+        "@electron-forge/maker-rpm": "^7.2.0",
        "@electron-forge/maker-snap": "^7.2.0",
        "@electron-forge/maker-squirrel": "^7.2.0",
-        "@electron-forge/maker-zip": "^7.3.0",
+        "@electron-forge/maker-zip": "^7.2.0",
+        "@electron/rebuild": "^3.4.0",
        "@svgr/webpack": "^8.1.0",
        "@types/classnames": "^2.3.1",
        "@types/electron": "^1.6.10",
@@ -83,8 +71,7 @@
        "babel-plugin-jsx-control-statements": "^4.1.2",
        "copy-webpack-plugin": "^11.0.0",
        "css-loader": "^6.7.1",
-        "electron": "29.0.1",
-        "electron-builder": "^24.12.0",
+        "electron": "28.1.3",
        "file-loader": "^6.2.0",
        "http-server": "^14.1.1",
        "less": "^4.1.2",
@@ -102,7 +89,5 @@
        "webpack-dev-server": "^4.9.1",
        "webpack-merge": "^5.8.0"
    },
-    "scripts": {
-        "postinstall": "electron-builder install-app-deps"
-    }
-}
+    "scripts": {}
+}
--- a/Show More
+++ b/Show More