fix tabs freeze on touchpad scroll

.github/workflows/build-helper.yml

@@ -1,100 +0,0 @@
-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:
-        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
-            - uses: actions/setup-go@v4
-              with:
-                  go-version: ${{env.GO_VERSION}}
-                  cache-dependency-path: |
-                      wavesrv/go.sum
-                      waveshell/go.sum
-                      scripthaus/go.sum
-            - 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"
-            - run: yarn --frozen-lockfile
-            - run: ./scripthaus/scripthaus run build-package-linux
-            - 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
-            - 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

@@ -49,7 +49,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -63,7 +63,7 @@ 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
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ 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
@@ -76,6 +76,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v2
       with:
         category: "/language:${{matrix.language}}"

.vscode/extensions.json

@@ -1,3 +0,0 @@
-{
-    "recommendations": ["esbenp.prettier-vscode", "golang.go", "dbaeumer.vscode-eslint"]
-}

.vscode/settings.json

@@ -1,21 +0,0 @@
-{
-    "editor.formatOnSave": true,
-    "[javascript]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "[javascriptreact]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "[typescript]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "[typescriptreact]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "[less]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "[css]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
-    }
-}

README.md

@@ -10,7 +10,7 @@
 
 # Wave Terminal 
 
-A open-source, cross-platform, AI-integrated, modern terminal for seamless workflows.
+A open-source, cross-platform, 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.
 
@@ -18,7 +18,6 @@ Wave isn't just another terminal emulator; it's a rethink on how terminals are b
 * Persistent sessions that can restore state across network disconnections and reboots
 * Searchable contextual command history across all remote sessions (saved locally)
 * Workspaces, tabs, and command blocks to keep you organized
-* AI Integration with ChatGPT (or ChatGPT compatible APIs) to help write commands and get answers inline
 
 ## Installation
 
@@ -36,7 +35,6 @@ brew install --cask wave
 * Homepage — https://www.waveterm.dev
 * Download Page — https://www.waveterm.dev/download
 * Documentation — https://docs.waveterm.dev/
-* Blog — https://blog.waveterm.dev/
 * Quick Start Guide — https://docs.waveterm.dev/quickstart/
 * Discord Community — https://discord.gg/XfvZ334gwU
 

acknowledgements/README.md

@@ -1,20 +0,0 @@
-# Open-Source Acknowledgements
-
-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:
-
-- [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 three disclaimer files linked above will be periodically regenerated to reflect new dependencies.
-
-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
-```

acknowledgements/go_licenses_report.tpl

@@ -1,16 +0,0 @@
-# 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 }}

buildres/build-universal.sh

@@ -1,21 +1,12 @@
 #!/bin/bash
 
 # assumes we have Wave-darwin-x64-[version].zip and Wave-darwin-arm64-[version].zip in current directory
-VERSION=0.6.1
+VERSION=0.5.2
 rm -rf temp
-rm -rf builds
 mkdir temp
 mkdir temp/x64
-aws s3 cp s3://waveterm-github-artifacts/waveterm-builds.zip .
+X64_ZIP="Wave-darwin-x64-$VERSION.zip"
-BUILDS_ZIP=waveterm-builds.zip
+ARM64_ZIP="Wave-darwin-arm64-$VERSION.zip"
-if ! [ -f $BUILDS_ZIP ]; then
-    echo "no $BUILDS_ZIP found";
-    exit 1;
-fi
-echo "unzipping $BUILDS_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;
@@ -57,6 +48,4 @@ DMG_NAME="waveterm-macos-universal-${DMG_VERSION}.dmg"
   $DMG_NAME \
   "temp/Wave.app"
 echo "success, created $DMG_NAME"
-mv $DMG_NAME builds/
-rm builds/Wave-darwin-*.zip
 spctl -a -vvv -t install temp/Wave.app/

buildres/osx-sign.js

@@ -7,10 +7,10 @@ signAsync({
     app: "temp/Wave.app",
     binaries: [
         waveAppPath + "/Contents/Resources/app/bin/wavesrv",
-        waveAppPath + "/Contents/Resources/app/bin/mshell/mshell-v0.4-linux.amd64",
+        waveAppPath + "/Contents/Resources/app/bin/mshell/mshell-v0.3-linux.amd64",
-        waveAppPath + "/Contents/Resources/app/bin/mshell/mshell-v0.4-linux.arm64",
+        waveAppPath + "/Contents/Resources/app/bin/mshell/mshell-v0.3-linux.arm64",
-        waveAppPath + "/Contents/Resources/app/bin/mshell/mshell-v0.4-darwin.amd64",
+        waveAppPath + "/Contents/Resources/app/bin/mshell/mshell-v0.3-darwin.amd64",
-        waveAppPath + "/Contents/Resources/app/bin/mshell/mshell-v0.4-darwin.arm64",
+        waveAppPath + "/Contents/Resources/app/bin/mshell/mshell-v0.3-darwin.arm64",
     ],
 }).then(() => {
     console.log("signing success");

go.work.sum

@@ -1,8 +1,4 @@
 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/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/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

package.json

@@ -2,7 +2,7 @@
     "name": "waveterm",
     "author": "Command Line Inc",
     "productName": "Wave",
-    "version": "0.6.1",
+    "version": "0.5.2",
     "main": "dist/emain.js",
     "license": "Apache-2.0",
     "dependencies": {
@@ -13,7 +13,6 @@
         "@tanstack/react-table": "^8.10.3",
         "@types/semver": "^7.5.6",
         "autobind-decorator": "^2.4.0",
-        "base64-js": "^1.5.1",
         "classnames": "^2.3.1",
         "dayjs": "^1.11.3",
         "dompurify": "^3.0.2",
@@ -27,6 +26,7 @@
         "papaparse": "^5.4.1",
         "react": "^18.1.0",
         "react-dom": "^18.1.0",
+        "react-json-view": "^1.21.3",
         "react-markdown": "^9.0.0",
         "remark": "^15.0.1",
         "remark-gfm": "^4.0.0",
@@ -35,8 +35,7 @@
         "tsx-control-statements": "^4.1.1",
         "uuid": "^9.0.0",
         "winston": "^3.8.2",
-        "xterm": "^5.0.0",
+        "xterm": "^5.0.0"
-        "xterm-addon-web-links": "^0.9.0"
     },
     "devDependencies": {
         "@babel/cli": "^7.17.10",
@@ -50,17 +49,17 @@
         "@babel/preset-env": "^7.18.2",
         "@babel/preset-react": "^7.23.3",
         "@babel/preset-typescript": "^7.17.12",
-        "@electron-forge/cli": "^7.2.0",
+        "@electron-forge/cli": "^6.0.0-beta.70",
-        "@electron-forge/maker-deb": "^7.2.0",
+        "@electron-forge/maker-deb": "^6.0.0-beta.70",
-        "@electron-forge/maker-rpm": "^7.2.0",
+        "@electron-forge/maker-rpm": "^6.0.0-beta.70",
-        "@electron-forge/maker-snap": "^7.2.0",
+        "@electron-forge/maker-snap": "^6.4.2",
-        "@electron-forge/maker-squirrel": "^7.2.0",
+        "@electron-forge/maker-squirrel": "^6.0.0-beta.70",
-        "@electron-forge/maker-zip": "^7.2.0",
+        "@electron-forge/maker-zip": "^6.0.0-beta.70",
         "@electron/rebuild": "^3.4.0",
         "@svgr/webpack": "^8.1.0",
         "@types/classnames": "^2.3.1",
         "@types/electron": "^1.6.10",
-        "@types/node": "20.11.0",
+        "@types/node": "20.10.3",
         "@types/papaparse": "^5.3.10",
         "@types/react": "^18.0.12",
         "@types/sprintf-js": "^1.1.3",
@@ -71,7 +70,7 @@
         "babel-plugin-jsx-control-statements": "^4.1.2",
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^6.7.1",
-        "electron": "28.1.3",
+        "electron": "27.1.3",
         "file-loader": "^6.2.0",
         "http-server": "^14.1.1",
         "less": "^4.1.2",
@@ -82,7 +81,7 @@
         "raw-loader": "^4.0.2",
         "react-split-it": "^2.0.0",
         "style-loader": "^3.3.1",
-        "typescript": "^5.0.0",
+        "typescript": "^4.7.3",
         "webpack": "^5.73.0",
         "webpack-bundle-analyzer": "^4.10.1",
         "webpack-cli": "^5.1.4",

scripthaus.md

@@ -44,10 +44,10 @@ rm -rf bin/
 rm -rf build/
 node_modules/.bin/webpack --env prod
 GO_LDFLAGS="-s -w -X main.BuildTime=$(date +'%Y%m%d%H%M')"
-(cd waveshell; CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-darwin.amd64 main-waveshell.go)
+(cd waveshell; CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.3-darwin.amd64 main-waveshell.go)
-(cd waveshell; CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-darwin.arm64 main-waveshell.go)
+(cd waveshell; CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.3-darwin.arm64 main-waveshell.go)
-(cd waveshell; CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-linux.amd64 main-waveshell.go)
+(cd waveshell; CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.3-linux.amd64 main-waveshell.go)
-(cd waveshell; CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-linux.arm64 main-waveshell.go)
+(cd waveshell; CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.3-linux.arm64 main-waveshell.go)
 (cd wavesrv; CGO_ENABLED=1 go build -tags "osusergo,netgo,sqlite_omit_load_extension" -ldflags "-X main.BuildTime=$(date +'%Y%m%d%H%M')" -o ../bin/wavesrv ./cmd)
 node_modules/.bin/electron-forge make
 ```
@@ -60,10 +60,10 @@ rm -rf bin/
 rm -rf build/
 node_modules/.bin/webpack --env prod
 GO_LDFLAGS="-s -w -X main.BuildTime=$(date +'%Y%m%d%H%M')"
-(cd waveshell; CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-darwin.amd64 main-waveshell.go)
+(cd waveshell; CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.3-darwin.amd64 main-waveshell.go)
-(cd waveshell; CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-darwin.arm64 main-waveshell.go)
+(cd waveshell; CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.3-darwin.arm64 main-waveshell.go)
-(cd waveshell; CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-linux.amd64 main-waveshell.go)
+(cd waveshell; CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.3-linux.amd64 main-waveshell.go)
-(cd waveshell; CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-linux.arm64 main-waveshell.go)
+(cd waveshell; CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.3-linux.arm64 main-waveshell.go)
 # adds -extldflags=-static, *only* on linux (macos does not support fully static binaries) to avoid a glibc dependency
 (cd wavesrv; CGO_ENABLED=1 go build -tags "osusergo,netgo,sqlite_omit_load_extension" -ldflags "-linkmode 'external' -extldflags=-static $GO_LDFLAGS" -o ../bin/wavesrv ./cmd)
 node_modules/.bin/electron-forge make
@@ -86,10 +86,10 @@ CGO_ENABLED=1 go build -tags "osusergo,netgo,sqlite_omit_load_extension" -ldflag
 set -e
 cd waveshell
 GO_LDFLAGS="-s -w -X main.BuildTime=$(date +'%Y%m%d%H%M')"
-CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-linux.amd64 main-waveshell.go
+CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.3-linux.amd64 main-waveshell.go
-CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-linux.arm64 main-waveshell.go
+CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.3-linux.arm64 main-waveshell.go
-CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-darwin.amd64 main-waveshell.go
+CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.3-darwin.amd64 main-waveshell.go
-CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-darwin.arm64 main-waveshell.go
+CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.3-darwin.arm64 main-waveshell.go
 ```
 
 ```bash
@@ -100,15 +100,3 @@ scripthaus run fullbuild-waveshell
 echo building wavesrv
 scripthaus run build-wavesrv
 ```
-
-```bash
-# @scripthaus command generate-license-disclaimers
-DISCLAIMER_DIR="./acknowledgements"
-DISCLAIMER_OUTPUT_DIR="$DISCLAIMER_DIR/disclaimers"
-if [ -d "$DISCLAIMER_OUTPUT_DIR" ]; then
-    rm -rf "$DISCLAIMER_OUTPUT_DIR"
-fi
-mkdir "$DISCLAIMER_OUTPUT_DIR"
-go run github.com/google/go-licenses@latest report ./wavesrv/... ./waveshell/... --template "$DISCLAIMER_DIR/go_licenses_report.tpl" --ignore github.com/wavetermdev/waveterm > "$DISCLAIMER_OUTPUT_DIR/backend.md"
-yarn licenses generate-disclaimer > "$DISCLAIMER_OUTPUT_DIR/frontend.md"
-```

src/app/app.less

@@ -99,6 +99,9 @@ body a {
 
 body code {
     font-family: @terminal-font;
+}
+
+body code {
     background-color: transparent;
 }
 
@@ -120,19 +123,11 @@ svg.icon {
 }
 
 .hideScrollbarUntillHover {
-    overflow: scroll;
+    overflow: hidden;
-
+    &:hover,
-    &::-webkit-scrollbar-thumb,
+    &:focus,
-    &::-webkit-scrollbar-track {
+    &:focus-within {
-        display: none;
+        overflow: auto;
-    }
-
-    &::-webkit-scrollbar-corner {
-        display: none;
-    }
-
-    &:hover::-webkit-scrollbar-thumb {
-        display: block;
     }
 }
 
@@ -481,26 +476,17 @@ a.a-block {
     }
 }
 
-.icon.color-default,
-.icon.color-green {
-    path,
-    circle {
-        fill: @tab-green;
-    }
-
-    i {
-        color: @tab-green;
-    }
-}
-
 .icon.color-red {
     path,
     circle {
         fill: @tab-red;
     }
+}
 
-    i {
+.icon.color-green {
-        color: @tab-red;
+    path,
+    circle {
+        fill: @tab-green;
     }
 }
 
@@ -509,10 +495,6 @@ a.a-block {
     circle {
         fill: @tab-orange;
     }
-
-    i {
-        color: @tab-orange;
-    }
 }
 
 .icon.color-blue {
@@ -520,10 +502,6 @@ a.a-block {
     circle {
         fill: @tab-blue;
     }
-
-    i {
-        color: @tab-blue;
-    }
 }
 
 .icon.color-yellow {
@@ -531,10 +509,6 @@ a.a-block {
     circle {
         fill: @tab-yellow;
     }
-
-    i {
-        color: @tab-yellow;
-    }
 }
 
 .icon.color-pink {
@@ -542,10 +516,6 @@ a.a-block {
     circle {
         fill: @tab-pink;
     }
-
-    i {
-        color: @tab-pink;
-    }
 }
 
 .icon.color-mint {
@@ -553,10 +523,6 @@ a.a-block {
     circle {
         fill: @tab-mint;
     }
-
-    i {
-        color: @tab-mint;
-    }
 }
 
 .icon.color-cyan {
@@ -564,10 +530,6 @@ a.a-block {
     circle {
         fill: @tab-cyan;
     }
-
-    i {
-        color: @tab-cyan;
-    }
 }
 
 .icon.color-violet {
@@ -575,10 +537,6 @@ a.a-block {
     circle {
         fill: @tab-violet;
     }
-
-    i {
-        color: @tab-violet;
-    }
 }
 
 .icon.color-white {
@@ -586,10 +544,6 @@ a.a-block {
     circle {
         fill: @tab-white;
     }
-
-    i {
-        color: @tab-white;
-    }
 }
 
 .status-icon.status-connected {
@@ -627,198 +581,3 @@ a.a-block {
 .text-selectable {
     user-select: text;
 }
-
-.spin {
-    animation: infiniteRotate 2s linear infinite;
-
-    @keyframes infiniteRotate {
-        from {
-            transform: rotate(0deg);
-        }
-        to {
-            transform: rotate(360deg);
-        }
-    }
-}
-
-.view {
-    background-color: @background-session;
-    flex-grow: 1;
-    display: flex;
-    flex-direction: column;
-    position: relative;
-    overflow: auto;
-    margin-bottom: 10px;
-    margin-right: 10px;
-    border-radius: 8px;
-    border: 1px solid rgba(241, 246, 243, 0.08);
-
-    .header {
-        margin: 24px 18px;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-
-        .close-div {
-            font-size: 1.5em;
-        }
-    }
-}
-
-.settings-field {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-
-    &.settings-field.sub-field {
-        .settings-label {
-            font-weight: normal;
-
-            text-align: right;
-            padding-right: 20px;
-        }
-    }
-
-    &.settings-error {
-        color: @term-red;
-        margin-top: 20px;
-        padding: 10px;
-        border-radius: 5px;
-        background-color: #200707;
-        border: 1px solid @term-red;
-        font-weight: bold;
-
-        .error-dismiss {
-            padding: 2px;
-            cursor: pointer;
-        }
-    }
-
-    .settings-label {
-        font-weight: bold;
-        width: 12em;
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        .info-message {
-            margin-left: 5px;
-        }
-    }
-
-    .settings-input {
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        color: @term-white;
-
-        &.settings-clickable {
-            cursor: pointer;
-        }
-
-        &.inline-edit.edit-active {
-            input.input {
-                padding: 0;
-                height: 20px;
-            }
-
-            .button {
-                height: 20px;
-            }
-        }
-
-        input {
-            padding: 4px;
-            border-radius: 3px;
-        }
-
-        .control {
-            .icon {
-                width: 1.5em;
-                height: 1.5em;
-                margin: 0;
-            }
-        }
-
-        .tab-color-icon.color-default path {
-            fill: @tab-green;
-        }
-        .tab-color-icon.color-green path {
-            fill: @tab-green;
-        }
-        .tab-color-icon.color-orange path {
-            fill: @tab-orange;
-        }
-        .tab-color-icon.color-red path {
-            fill: @tab-red;
-        }
-        .tab-color-icon.color-yellow path {
-            fill: @tab-yellow;
-        }
-        .tab-color-icon.color-blue path {
-            fill: @tab-blue;
-        }
-        .tab-color-icon.color-mint path {
-            fill: @tab-mint;
-        }
-        .tab-color-icon.color-cyan path {
-            fill: @tab-cyan;
-        }
-        .tab-color-icon.color-white path {
-            fill: @tab-white;
-        }
-        .tab-color-icon.color-violet path {
-            fill: @tab-violet;
-        }
-        .tab-color-icon.color-pink path {
-            fill: @tab-pink;
-        }
-
-        .tab-colors,
-        .tab-icons {
-            display: flex;
-            flex-direction: row;
-            align-items: center;
-
-            .tab-color-sep,
-            .tab-icon-sep {
-                padding-left: 10px;
-                padding-right: 10px;
-                font-weight: bold;
-            }
-
-            .tab-color-icon,
-            .tab-icon-icon {
-                width: 1.1em;
-                vertical-align: middle;
-            }
-
-            .tab-color-name,
-            .tab-icon-name {
-                margin-left: 1em;
-            }
-
-            .tab-color-select,
-            .tab-icon-select {
-                cursor: pointer;
-                margin: 5px;
-                &:hover {
-                    outline: 2px solid white;
-                }
-            }
-        }
-
-        .action-text {
-            margin-left: 20px;
-
-            color: @term-red;
-        }
-
-        .settings-share-link {
-            width: 160px;
-        }
-    }
-
-    &:not(:first-child) {
-        margin-top: 10px;
-    }
-}

src/app/app.tsx

@@ -7,29 +7,35 @@ import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { If } from "tsx-control-statements/components";
 import dayjs from "dayjs";
+import type { ContextMenuOpts } from "../types/types";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel } from "@/models";
+import { GlobalModel } from "../model/model";
-import { isBlank } from "@/util/util";
+import { isBlank } from "../util/util";
 import { WorkspaceView } from "./workspace/workspaceview";
 import { PluginsView } from "./pluginsview/pluginsview";
 import { BookmarksView } from "./bookmarks/bookmarks";
 import { HistoryView } from "./history/history";
 import { ConnectionsView } from "./connections/connections";
-import { ClientSettingsView } from "./clientsettings/clientsettings";
+import {
+    ScreenSettingsModal,
+    SessionSettingsModal,
+    LineSettingsModal,
+    ClientSettingsModal,
+} from "./common/modals/settings";
 import { MainSideBar } from "./sidebar/sidebar";
-import { DisconnectedModal, ClientStopModal } from "./common/modals";
+import { DisconnectedModal, ClientStopModal, ModalsProvider } from "./common/modals/modals";
-import { ModalsProvider } from "./common/modals/provider";
 import { ErrorBoundary } from "./common/error/errorboundary";
 import "./app.less";
 
 dayjs.extend(localizedFormat);
 
+type OV<V> = mobx.IObservableValue<V>;
+
 @mobxReact.observer
 class App extends React.Component<{}, {}> {
     dcWait: OV<boolean> = mobx.observable.box(false, { name: "dcWait" });
-    mainContentRef: React.RefObject<HTMLDivElement> = React.createRef();
 
-    constructor(props: {}) {
+    constructor(props: any) {
         super(props);
         if (GlobalModel.isDev) document.body.className = "is-dev";
     }
@@ -68,18 +74,12 @@ class App extends React.Component<{}, {}> {
     }
 
     render() {
+        let clientSettingsModal = GlobalModel.clientSettingsModal.get();
         let remotesModel = GlobalModel.remotesModel;
         let disconnected = !GlobalModel.ws.open.get() || !GlobalModel.waveSrvRunning.get();
         let hasClientStop = GlobalModel.getHasClientStop();
         let dcWait = this.dcWait.get();
         let platform = GlobalModel.getPlatform();
-        let clientData = GlobalModel.clientData.get();
-
-        // Previously, this is done in sidebar.tsx but it causes flicker when clientData is null cos screen-view shifts around.
-        // Doing it here fixes the flicker cos app is not rendered until clientData is populated.
-        if (clientData == null) {
-            return null;
-        }
 
         if (disconnected || hasClientStop) {
             if (!dcWait) {
@@ -87,8 +87,8 @@ class App extends React.Component<{}, {}> {
             }
             return (
                 <div id="main" className={"platform-" + platform} onContextMenu={this.handleContextMenu}>
-                    <div ref={this.mainContentRef} className="main-content">
+                    <div className="main-content">
-                        <MainSideBar parentRef={this.mainContentRef} clientData={clientData} />
+                        <MainSideBar />
                         <div className="session-view" />
                     </div>
                     <If condition={dcWait}>
@@ -107,15 +107,14 @@ class App extends React.Component<{}, {}> {
         }
         return (
             <div id="main" className={"platform-" + platform} onContextMenu={this.handleContextMenu}>
-                <div ref={this.mainContentRef} className="main-content">
+                <div className="main-content">
-                    <MainSideBar parentRef={this.mainContentRef} clientData={clientData} />
+                    <MainSideBar />
                     <ErrorBoundary>
                         <PluginsView />
                         <WorkspaceView />
                         <HistoryView />
                         <BookmarksView />
                         <ConnectionsView model={remotesModel} />
-                        <ClientSettingsView model={remotesModel} />
                     </ErrorBoundary>
                 </div>
                 <ModalsProvider />

src/app/appconst.ts

@@ -7,53 +7,7 @@ export const SCREEN_SETTINGS = "screenSettings";
 export const SESSION_SETTINGS = "sessionSettings";
 export const LINE_SETTINGS = "lineSettings";
 export const CLIENT_SETTINGS = "clientSettings";
-export const TAB_SWITCHER = "tabSwitcher";
-export const USER_INPUT = "userInput";
 
 export const LineContainer_Main = "main";
 export const LineContainer_History = "history";
 export const LineContainer_Sidebar = "sidebar";
-
-export const ConfirmKey_HideShellPrompt = "hideshellprompt";
-
-export const NoStrPos = -1;
-
-export const RemotePtyRows = 8; // also in main.tsx
-export const RemotePtyCols = 80;
-export const ProdServerEndpoint = "http://127.0.0.1:1619";
-export const ProdServerWsEndpoint = "ws://127.0.0.1:1623";
-export const DevServerEndpoint = "http://127.0.0.1:8090";
-export const DevServerWsEndpoint = "ws://127.0.0.1:8091";
-export const DefaultTermFontSize = 12;
-export const MinFontSize = 8;
-export const MaxFontSize = 24;
-export const InputChunkSize = 500;
-export const RemoteColors = ["red", "green", "yellow", "blue", "magenta", "cyan", "white", "orange"];
-export const TabColors = ["red", "orange", "yellow", "green", "mint", "cyan", "blue", "violet", "pink", "white"];
-export const TabIcons = [
-    "sparkle",
-    "fire",
-    "ghost",
-    "cloud",
-    "compass",
-    "crown",
-    "droplet",
-    "graduation-cap",
-    "heart",
-    "file",
-];
-
-// @ts-ignore
-export const VERSION = __WAVETERM_VERSION__;
-// @ts-ignore
-export const BUILD = __WAVETERM_BUILD__;
-
-/**
- * Levels for the screen status indicator
- */
-export enum StatusIndicatorLevel {
-    None = 0,
-    Output = 1,
-    Success = 2,
-    Error = 3,
-}

src/app/assets/icons/spinner-indicator.svg

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg width="440" height="440" version="1.1" viewBox="0 0 116.42 116.42" xmlns="http://www.w3.org/2000/svg">
- <circle id="indicator" cx="58.266" cy="58.266" r="28.311" stroke-width=".19016"/>
- <path id="spinner" d="m107.2 58.21a48.988 48.988 0 0 1-48.988 48.988" fill="none" stroke="#000" stroke-width="16.856" style="paint-order:normal"/>
-</svg>

src/app/bookmarks/bookmarks.less

@@ -1,4 +1,4 @@
-@import "@/common/themes/themes.less";
+@import "../../app/common/themes/themes.less";
 
 .bookmarks-view {
     background-color: @background-session;

src/app/bookmarks/bookmarks.tsx

@@ -7,27 +7,20 @@ import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
-import { GlobalModel } from "@/models";
+import type { BookmarkType } from "../../types/types";
-import { CmdStrCode, Markdown } from "@/common/elements";
+import { GlobalModel } from "../../model/model";
+import { CmdStrCode, Markdown } from "../common/common";
 
-import { ReactComponent as XmarkIcon } from "@/assets/icons/line/xmark.svg";
+import { ReactComponent as XmarkIcon } from "../assets/icons/line/xmark.svg";
-import { ReactComponent as CopyIcon } from "@/assets/icons/favourites/copy.svg";
+import { ReactComponent as CopyIcon } from "../assets/icons/favourites/copy.svg";
-import { ReactComponent as PenIcon } from "@/assets/icons/favourites/pen.svg";
+import { ReactComponent as PenIcon } from "../assets/icons/favourites/pen.svg";
-import { ReactComponent as TrashIcon } from "@/assets/icons/favourites/trash.svg";
+import { ReactComponent as TrashIcon } from "../assets/icons/favourites/trash.svg";
-import { ReactComponent as FavoritesIcon } from "@/assets/icons/favourites.svg";
+import { ReactComponent as FavoritesIcon } from "../assets/icons/favourites.svg";
 
 import "./bookmarks.less";
 
-type BookmarkProps = {
-    bookmark: BookmarkType;
-};
-
 @mobxReact.observer
-class Bookmark extends React.Component<BookmarkProps, {}> {
+class Bookmark extends React.Component<{ bookmark: BookmarkType }, {}> {
-    constructor(props: BookmarkProps) {
-        super(props);
-    }
-
     @boundMethod
     handleDeleteClick(): void {
         let { bookmark } = this.props;
@@ -186,10 +179,6 @@ class Bookmark extends React.Component<BookmarkProps, {}> {
 
 @mobxReact.observer
 class BookmarksView extends React.Component<{}, {}> {
-    constructor(props: {}) {
-        super(props);
-    }
-
     @boundMethod
     closeView(): void {
         GlobalModel.bookmarksModel.closeView();