Trying to add react-dev-tools

* tab hover

* border radius fix, and lighter scrollbar background

* tone down colors a bit

* fix shelltag

* hack collapsable sidebar (needs cleanup)

.github/workflows/build-helper.yml

@@ -1,69 +1,35 @@
 name: "Build Helper"
 on: workflow_dispatch
 env:
-    WAVETERM_VERSION: 0.6.1
     GO_VERSION: "1.21.5"
     NODE_VERSION: "21.5.0"
 jobs:
-    runbuild-darwin-x64:
+    runbuild:
-        name: "Build MacOS x64"
+        outputs:
-        runs-on: macos-latest
+            WAVETERM_VERSION: ${{ steps.set-version.outputs.WAVETERM_VERSION }}
-        steps:
+        strategy:
-            - uses: actions/checkout@v4
+            matrix:
-            - uses: actions/setup-go@v4
+                include:
-              with:
+                    - platform: "darwin"
-                  go-version: ${{env.GO_VERSION}}
+                      arch: "x64"
-                  cache-dependency-path: |
+                      runner: "macos-latest"
-                      wavesrv/go.sum
+                      scripthaus: "build-package"
-                      waveshell/go.sum
+                    - platform: "darwin"
-            - run: brew tap scripthaus-dev/scripthaus
+                      arch: "arm64"
-            - run: brew install scripthaus
+                      runner: "macos-latest-xlarge"
-            - uses: actions/setup-node@v4
+                      scripthaus: "build-package"
-              with:
+                    - platform: "linux"
-                  node-version: ${{env.NODE_VERSION}}
+                      arch: "x64"
-                  cache: "yarn"
+                      runner: "ubuntu-latest"
-            - run: yarn --frozen-lockfile
+                      scripthaus: "build-package-linux"
-            - run: scripthaus run build-package
+        runs-on: ${{ matrix.runner }}
-            - 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
-            - uses: actions/setup-go@v4
+            - uses: actions/setup-go@v5
               with:
                   go-version: ${{env.GO_VERSION}}
                   cache-dependency-path: |
@@ -79,22 +45,31 @@ jobs:
               with:
                   node-version: ${{env.NODE_VERSION}}
                   cache: "yarn"
+            - id: set-version
+              run: |
+                  VERSION=$(node -e 'console.log(require("./version.js"))')
+                  echo "WAVETERM_VERSION=${VERSION}" >> "$GITHUB_OUTPUT"
             - run: yarn --frozen-lockfile
-            - run: ./scripthaus/scripthaus run build-package-linux
+            - run: ./scripthaus/scripthaus run ${{ matrix.scripthaus }}
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: waveterm-build-${{ matrix.platform }}-${{ matrix.arch }}
+                  path: out/make/zip/${{ matrix.platform }}/${{ matrix.arch }}/*.zip
+                  retention-days: 2
+    upload:
+        name: "Upload Builds"
+        runs-on: ubuntu-latest
+        needs: [runbuild]
+        steps:
             - uses: actions/download-artifact@v4
               with:
                   merge-multiple: true
                   path: buildtemp
             - run: |
-                  mv out/make/zip/linux/x64/Wave-linux-x64-$WAVETERM_VERSION.zip buildtemp/waveterm-linux-x64-v$WAVETERM_VERSION.zip
+                  echo "${{ needs.runbuild.outputs.WAVETERM_VERSION }}" > buildtemp/version.txt
             - 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

.github/workflows/codeql.yml

@@ -12,70 +12,69 @@
 name: "CodeQL"
 
 on:
-  push:
+    push:
-    branches: [ "main" ]
+        branches: ["main"]
-  pull_request:
+    pull_request:
-    branches: [ "main" ]
+        branches: ["main"]
-  schedule:
+    schedule:
-    - cron: '36 5 * * 5'
+        - cron: "36 5 * * 5"
 
 jobs:
-  analyze:
+    analyze:
-    name: Analyze
+        name: Analyze
-    # Runner size impacts CodeQL analysis time. To learn more, please see:
+        # Runner size impacts CodeQL analysis time. To learn more, please see:
-    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+        #   - https://gh.io/recommended-hardware-resources-for-running-codeql
-    #   - https://gh.io/supported-runners-and-hardware-resources
+        #   - https://gh.io/supported-runners-and-hardware-resources
-    #   - https://gh.io/using-larger-runners
+        #   - https://gh.io/using-larger-runners
-    # Consider using larger runners for possible analysis time improvements.
+        # Consider using larger runners for possible analysis time improvements.
-    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+        runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
-    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+        timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
-    permissions:
+        permissions:
-      actions: read
+            actions: read
-      contents: read
+            contents: read
-      security-events: write
+            security-events: write
 
-    strategy:
+        strategy:
-      fail-fast: false
+            fail-fast: false
-      matrix:
+            matrix:
-        language: [ 'go', 'javascript-typescript' ]
+                language: ["go", "javascript-typescript"]
-        # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
+                # 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 'java-kotlin' to analyze code written in Java, Kotlin or both
-        # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript 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
+                # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
-    steps:
+        steps:
-    - name: Checkout repository
+            - name: Checkout repository
-      uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
-    # Initializes the CodeQL tools for scanning.
+            # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
+            - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+              uses: github/codeql-action/init@v3
-      with:
+              with:
-        languages: ${{ matrix.language }}
+                  languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
+                  # 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.
+                  # 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.
+                  # 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
+                  # 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
+                  # 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
 
-    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
+            # ℹ️ Command-line programs to run using the OS shell.
-    # If this step fails, then you should remove it and run the build manually (see below)
+            # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
 
-    # ℹ️ Command-line programs to run using the OS shell.
+            #   If the Autobuild fails above, remove it and uncomment the following three lines.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+            #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
-    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+            # - run: |
-    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+            #     echo "Run, Build Application using script"
+            #     ./location_of_script_within_repo/buildscript.sh
 
-    # - run: |
+            - name: Perform CodeQL Analysis
-    #     echo "Run, Build Application using script"
+              uses: github/codeql-action/analyze@v3
-    #     ./location_of_script_within_repo/buildscript.sh
+              with:
-
+                  category: "/language:${{matrix.language}}"
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
-      with:
-        category: "/language:${{matrix.language}}"

README.md

@@ -1,8 +1,8 @@
 <p align="center">
   <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="./assets/wave-logo_horizontal-coloronblack.svg">
+    <source media="(prefers-color-scheme: dark)" srcset="./assets/waveterm-logo-horizontal-dark.png">
-    <source media="(prefers-color-scheme: light)" srcset="./assets/wave-logo_horizontal-coloronwhite.svg">
+    <source media="(prefers-color-scheme: light)" srcset="./assets/waveterm-logo-horizontal-light.png">
-    <img alt="Wave Terminal Logo" src="./assets/wave-logo_horizontal-coloronwhite.svg" width="352" height="59" style="max-width: 100%;">
+    <img alt="Wave Terminal Logo" src="./assets/waveterm-logo-horizontal-light.png" width="240" height="80" style="max-width: 100%;">
   </picture>
   <br/>
 </p>

acknowledgements/disclaimers/backend.md

@@ -179,11 +179,11 @@ THE SOFTWARE.
 
 -----
 
-## github.com/google/go-github/v57/github
+## github.com/google/go-github/v59/github
 
-* Name: github.com/google/go-github/v57/github
+* Name: github.com/google/go-github/v59/github
-* Version: v57.0.0
+* Version: v59.0.0
-* License: [BSD-3-Clause](https://github.com/google/go-github/blob/v57.0.0/LICENSE)
+* License: [BSD-3-Clause](https://github.com/google/go-github/blob/v59.0.0/LICENSE)
 
 ```txt
 Copyright (c) 2013 The go-github AUTHORS. All rights reserved.

buildres/.gitignore

@@ -1,3 +1,3 @@
-temp/
+*/
 *.zip
-*.dmg
+*.dmg

buildres/build-universal.js

@@ -1,9 +1,9 @@
 const eu = require("@electron/universal");
 const path = require("path");
 
-let x64Path = path.resolve(__dirname, "temp", "x64", "Wave.app")
+const x64Path = path.resolve(__dirname, "temp", "x64", "Wave.app");
-let arm64Path = path.resolve(__dirname, "temp", "arm64", "Wave.app")
+const arm64Path = path.resolve(__dirname, "temp", "arm64", "Wave.app");
-let outPath = path.resolve(__dirname, "temp", "Wave.app")
+const outPath = path.resolve(__dirname, "temp", "Wave.app");
 
 console.log("building universal package");
 console.log("x64 path", x64Path);

buildres/build-universal.sh

@@ -1,11 +1,19 @@
 #!/bin/bash
+# This script is used to build the universal app for macOS
 
-# assumes we have Wave-darwin-x64-[version].zip and Wave-darwin-arm64-[version].zip in current directory
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-VERSION=0.6.1
+
-rm -rf temp
+rm -f *.zip *.dmg
-rm -rf builds
+ZIP_DIR=$SCRIPT_DIR/zip
-mkdir temp
+rm -rf $ZIP_DIR
-mkdir temp/x64
+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
 aws s3 cp s3://waveterm-github-artifacts/waveterm-builds.zip .
 BUILDS_ZIP=waveterm-builds.zip
 if ! [ -f $BUILDS_ZIP ]; then
@@ -13,40 +21,66 @@ if ! [ -f $BUILDS_ZIP ]; then
     exit 1;
 fi
 echo "unzipping $BUILDS_ZIP"
-unzip -q $BUILDS_ZIP -d builds
+unzip -q $BUILDS_ZIP -d $BUILDS_DIR
-X64_ZIP="builds/Wave-darwin-x64-$VERSION.zip"
+rm $BUILDS_ZIP
-ARM64_ZIP="builds/Wave-darwin-arm64-$VERSION.zip"
+
-if ! [ -f $X64_ZIP ]; then
+# Ensure we have exactly one of each build
-    echo "no $X64_ZIP found";
+find_build() 
-    exit 1;
+{
-fi
+    local BUILD_DIR=$1
-if ! [ -f $ARM64_ZIP ]; then
+    local BUILD_PATTERN=$2
-    echo "no $ARM64_ZIP found"
+    local BUILD_PATH=$(find $BUILD_DIR -type f -iname "$BUILD_PATTERN")
-    exit 1;
+    local NUM_MATCHES=$(echo $BUILD_PATH | wc -l)
-fi
+    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")
 set -e
-echo "unzipping version v$VERSION zip files"
+
-ls -l "$X64_ZIP" "$ARM64_ZIP"
+echo "unzipping zip files"
-unzip -q $X64_ZIP -d temp/x64
+unzip -q $X64_ZIP -d $TEMP_DIR/x64
-mkdir temp/arm64
+unzip -q $ARM64_ZIP -d $TEMP_DIR/arm64
-unzip -q $ARM64_ZIP -d temp/arm64
+rm $ARM64_ZIP $X64_ZIP
-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
+# Create universal app and sign and notarize it
-mv temp/x64/Wave.app/Contents/Resources/app temp/
+TEMP_WAVE_DIR_ARM=$TEMP_DIR/x64/Wave.app
-cp temp/wavesrv temp/app/bin/wavesrv
+TEMP_WAVE_DIR_X64=$TEMP_DIR/arm64/Wave.app
-mkdir temp/x64/Wave.app/Contents/Resources/app
+TEMP_WAVE_DIR_UNIVERSAL=$TEMP_DIR/Wave.app
-mkdir temp/arm64/Wave.app/Contents/Resources/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
-node build-universal.js
+rm -rf $TEMP_WAVE_DIR_ARM/Contents/Resources/app
-rm -rf temp/Wave.app/Contents/Resources/app
+mv $TEMP_WAVE_DIR_X64/Contents/Resources/app $TEMP_DIR
-mv temp/app temp/Wave.app/Contents/Resources/app
+cp $TEMP_DIR/wavesrv $TEMP_DIR/app/bin/wavesrv
-node osx-sign.js
+mkdir $TEMP_WAVE_DIR_ARM/Contents/Resources/app
-DEBUG=electron-notarize node osx-notarize.js
+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 "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"
-rm -f *.dmg
+$SCRIPT_DIR/../../create-dmg/create-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 \
@@ -55,8 +89,9 @@ DMG_NAME="waveterm-macos-universal-${DMG_VERSION}.dmg"
   --hide-extension "Wave.app" \
   --app-drop-link 400 125 \
   $DMG_NAME \
-  "temp/Wave.app"
+  "$TEMP_WAVE_DIR_UNIVERSAL"
 echo "success, created $DMG_NAME"
-mv $DMG_NAME builds/
+mv $DMG_NAME $BUILDS_DIR/
-rm builds/Wave-darwin-*.zip
+spctl -a -vvv -t install $TEMP_WAVE_DIR_UNIVERSAL/
-spctl -a -vvv -t install temp/Wave.app/
+
+rm -rf $TEMP_DIR $ZIP_DIR

buildres/osx-notarize.js

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

buildres/osx-sign.js

@@ -1,10 +1,10 @@
 const { signAsync } = require("@electron/osx-sign");
-// DEBUG="electron-osx-sign*"
+const path = require("path");
 
 console.log("running osx-sign");
-let waveAppPath = "temp/Wave.app";
+const waveAppPath = path.resolve(__dirname, "temp", "Wave.app");
 signAsync({
-    app: "temp/Wave.app",
+    app: waveAppPath,
     binaries: [
         waveAppPath + "/Contents/Resources/app/bin/wavesrv",
         waveAppPath + "/Contents/Resources/app/bin/mshell/mshell-v0.4-linux.amd64",
@@ -12,9 +12,11 @@ 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");
+    .then(() => {
-}).catch((e) => {
+        console.log("signing success");
-    console.log("signing error", e);
+    })
-    process.exit(1);
+    .catch((e) => {
-});
+        console.log("signing error", e);
+        process.exit(1);
+    });

go.work.sum

@@ -1,3 +1,4 @@
+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=

package.json

@@ -2,7 +2,7 @@
     "name": "waveterm",
     "author": "Command Line Inc",
     "productName": "Wave",
-    "version": "0.6.1",
+    "version": "v0.6.1",
     "main": "dist/emain.js",
     "license": "Apache-2.0",
     "dependencies": {
@@ -72,6 +72,7 @@
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^6.7.1",
         "electron": "28.1.3",
+        "electron-devtools-installer": "^3.2.0",
         "file-loader": "^6.2.0",
         "http-server": "^14.1.1",
         "less": "^4.1.2",

public/index-dev.html

@@ -13,7 +13,6 @@
     </head>
     <body>
         <div id="measure"></div>
-        <div id="title-bar"></div>
         <div id="app"></div>
     </body>
 </html>

public/index.html

@@ -13,7 +13,6 @@
     </head>
     <body>
         <div id="measure"></div>
-        <div id="title-bar"></div>
         <div id="app"></div>
     </body>
 </html>