don't show archived screens with Cmd-P

* better osrelease parsing (ignore garbage at end of string)

* add defaultshelltype to telemetry input

* track reinit errors by shelltype to see if zsh integration is working

.github/workflows/build-helper.yml

@@ -0,0 +1,102 @@
+name: "Build Helper"
+on: workflow_dispatch
+env:
+    WAVETERM_VERSION: 0.6.0
+    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/build-macos-x64.yml

@@ -1,57 +0,0 @@
-name: "Build MacOS x64"
-on: workflow_dispatch
-env:
-    WAVETERM_VERSION: 0.5.3
-    GO_VERSION: '1.21.5'
-    NODE_VERSION: '21.5.0'
-jobs:
-    runbuild-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@v3
-              with:
-                name: waveterm-build-darwin-x64
-                path: out/make/zip/darwin/x64/*.zip
-                retention-days: 2
-    runbuild-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@v3
-              with:
-                name: waveterm-build-darwin-arm64
-                path: out/make/zip/darwin/arm64/*.zip
-                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@v2
+      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.
@@ -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@v2
+      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
@@ -76,6 +76,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"

buildres/build-universal.sh

@@ -1,12 +1,21 @@
 #!/bin/bash
 
 # assumes we have Wave-darwin-x64-[version].zip and Wave-darwin-arm64-[version].zip in current directory
-VERSION=0.5.3
+VERSION=0.6.0
 rm -rf temp
+rm -rf builds
 mkdir temp
 mkdir temp/x64
-X64_ZIP="Wave-darwin-x64-$VERSION.zip"
-ARM64_ZIP="Wave-darwin-arm64-$VERSION.zip"
+aws s3 cp s3://waveterm-github-artifacts/waveterm-builds.zip .
+BUILDS_ZIP=waveterm-builds.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;
@@ -48,4 +57,6 @@ 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.3-linux.amd64",
-        waveAppPath + "/Contents/Resources/app/bin/mshell/mshell-v0.3-linux.arm64",
-        waveAppPath + "/Contents/Resources/app/bin/mshell/mshell-v0.3-darwin.amd64",
-        waveAppPath + "/Contents/Resources/app/bin/mshell/mshell-v0.3-darwin.arm64",
+        waveAppPath + "/Contents/Resources/app/bin/mshell/mshell-v0.4-linux.amd64",
+        waveAppPath + "/Contents/Resources/app/bin/mshell/mshell-v0.4-linux.arm64",
+        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");

package.json

@@ -2,7 +2,7 @@
     "name": "waveterm",
     "author": "Command Line Inc",
     "productName": "Wave",
-    "version": "0.5.3",
+    "version": "0.6.0",
     "main": "dist/emain.js",
     "license": "Apache-2.0",
     "dependencies": {

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.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.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.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.3-linux.arm64 main-waveshell.go)
+(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=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-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=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-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.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.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.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.3-linux.arm64 main-waveshell.go)
+(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=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-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=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-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.3-linux.amd64 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.3-darwin.amd64 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
+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=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-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=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-darwin.arm64 main-waveshell.go
 ```
 
 ```bash

src/app/app.less

@@ -622,3 +622,41 @@ 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);
+    background: rgba(13, 13, 13, 0.85);
+
+    .header {
+        margin: 24px 18px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+
+        .close-div {
+            font-size: 1.5em;
+        }
+    }
+}

src/app/app.tsx

@@ -16,6 +16,7 @@ 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 { MainSideBar } from "./sidebar/sidebar";
 import { DisconnectedModal, ClientStopModal } from "./common/modals";
 import { ModalsProvider } from "./common/modals/provider";
@@ -109,6 +110,7 @@ class App extends React.Component<{}, {}> {
                         <HistoryView />
                         <BookmarksView />
                         <ConnectionsView model={remotesModel} />
+                        <ClientSettingsView model={remotesModel} />
                     </ErrorBoundary>
                 </div>
                 <ModalsProvider />

src/app/clientsettings/clientsettings.less

@@ -0,0 +1,200 @@
+@import "../../app/common/themes/themes.less";
+
+.clientsettings-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);
+    background: rgba(13, 13, 13, 0.85);
+
+    .header {
+        margin: 24px 18px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding-bottom: 20px;
+        border-bottom: 1px solid white;
+    }
+
+    .content {
+        padding: 0 18px 0 30px;
+    }
+
+    // just marked these as important since we're keeping the
+    // settings-field styles below this intact until we figure out what do with them
+    .settings-field {
+        &:not(:first-child) {
+            margin-top: 15px !important;
+        }
+
+        .settings-label {
+            width: 250px !important;
+        }
+    }
+
+    // @TODO: These styles are duplicated in the settings modals
+    .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;
+            margin-right: 10px;
+
+            .info-message {
+                margin-left: 5px;
+            }
+        }
+
+        .settings-input {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+
+            &.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/clientsettings/clientsettings.tsx

@@ -0,0 +1,222 @@
+// Copyright 2023, Command Line Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+import * as React from "react";
+import * as mobxReact from "mobx-react";
+import * as mobx from "mobx";
+import { boundMethod } from "autobind-decorator";
+import cn from "classnames";
+import { GlobalModel, GlobalCommandRunner, MinFontSize, MaxFontSize, RemotesModel } from "../../model/model";
+import { Toggle, InlineSettingsTextEdit, SettingsError, Dropdown } from "../common/common";
+import { CommandRtnType, ClientDataType } from "../../types/types";
+import { commandRtnHandler, isBlank } from "../../util/util";
+
+import "./clientsettings.less";
+
+type OV<V> = mobx.IObservableValue<V>;
+
+// @ts-ignore
+const VERSION = __WAVETERM_VERSION__;
+// @ts-ignore
+const BUILD = __WAVETERM_BUILD__;
+
+@mobxReact.observer
+class ClientSettingsView extends React.Component<{ model: RemotesModel }, { hoveredItemId: string }> {
+    fontSizeDropdownActive: OV<boolean> = mobx.observable.box(false, { name: "clientSettings-fontSizeDropdownActive" });
+    errorMessage: OV<string> = mobx.observable.box(null, { name: "ClientSettings-errorMessage" });
+
+    @boundMethod
+    dismissError(): void {
+        mobx.action(() => {
+            this.errorMessage.set(null);
+        })();
+    }
+
+    @boundMethod
+    handleChangeFontSize(fontSize: string): void {
+        let newFontSize = Number(fontSize);
+        this.fontSizeDropdownActive.set(false);
+        if (GlobalModel.termFontSize.get() == newFontSize) {
+            return;
+        }
+        let prtn = GlobalCommandRunner.setTermFontSize(newFontSize, false);
+        commandRtnHandler(prtn, this.errorMessage);
+    }
+
+    @boundMethod
+    togglefontSizeDropdown(): void {
+        mobx.action(() => {
+            this.fontSizeDropdownActive.set(!this.fontSizeDropdownActive.get());
+        })();
+    }
+
+    @boundMethod
+    handleChangeTelemetry(val: boolean): void {
+        let prtn: Promise<CommandRtnType> = null;
+        if (val) {
+            prtn = GlobalCommandRunner.telemetryOn(false);
+        } else {
+            prtn = GlobalCommandRunner.telemetryOff(false);
+        }
+        commandRtnHandler(prtn, this.errorMessage);
+    }
+
+    @boundMethod
+    handleChangeReleaseCheck(val: boolean): void {
+        let prtn: Promise<CommandRtnType> = null;
+        if (val) {
+            prtn = GlobalCommandRunner.releaseCheckAutoOn(false);
+        } else {
+            prtn = GlobalCommandRunner.releaseCheckAutoOff(false);
+        }
+        commandRtnHandler(prtn, this.errorMessage);
+    }
+
+    getFontSizes(): any {
+        let availableFontSizes: { label: string; value: number }[] = [];
+        for (let s = MinFontSize; s <= MaxFontSize; s++) {
+            availableFontSizes.push({ label: s + "px", value: s });
+        }
+        return availableFontSizes;
+    }
+
+    @boundMethod
+    inlineUpdateOpenAIModel(newModel: string): void {
+        let prtn = GlobalCommandRunner.setClientOpenAISettings({ model: newModel });
+        commandRtnHandler(prtn, this.errorMessage);
+    }
+
+    @boundMethod
+    inlineUpdateOpenAIToken(newToken: string): void {
+        let prtn = GlobalCommandRunner.setClientOpenAISettings({ apitoken: newToken });
+        commandRtnHandler(prtn, this.errorMessage);
+    }
+
+    @boundMethod
+    inlineUpdateOpenAIMaxTokens(newMaxTokensStr: string): void {
+        let prtn = GlobalCommandRunner.setClientOpenAISettings({ maxtokens: newMaxTokensStr });
+        commandRtnHandler(prtn, this.errorMessage);
+    }
+
+    @boundMethod
+    setErrorMessage(msg: string): void {
+        mobx.action(() => {
+            this.errorMessage.set(msg);
+        })();
+    }
+
+    @boundMethod
+    handleClose(): void {
+        GlobalModel.clientSettingsViewModel.closeView();
+    }
+
+    render() {
+        let isHidden = GlobalModel.activeMainView.get() != "clientsettings";
+        if (isHidden) {
+            return null;
+        }
+
+        let cdata: ClientDataType = GlobalModel.clientData.get();
+        let openAIOpts = cdata.openaiopts ?? {};
+        let apiTokenStr = isBlank(openAIOpts.apitoken) ? "(not set)" : "********";
+        let maxTokensStr = String(
+            openAIOpts.maxtokens == null || openAIOpts.maxtokens == 0 ? 1000 : openAIOpts.maxtokens
+        );
+        let curFontSize = GlobalModel.termFontSize.get();
+
+        return (
+            <div className={cn("view clientsettings-view")}>
+                <header className="header">
+                    <div className="clientsettings-title text-primary">Client Settings</div>
+                    <div className="close-div hoverEffect" title="Close (Escape)" onClick={this.handleClose}>
+                        <i className="fa-sharp fa-solid fa-xmark"></i>
+                    </div>
+                </header>
+                <div className="content">
+                    <div className="settings-field">
+                        <div className="settings-label">Term Font Size</div>
+                        <div className="settings-input">
+                            <Dropdown
+                                className="font-size-dropdown"
+                                options={this.getFontSizes()}
+                                defaultValue={`${curFontSize}px`}
+                                onChange={this.handleChangeFontSize}
+                            />
+                        </div>
+                    </div>
+                    <div className="settings-field">
+                        <div className="settings-label">Client ID</div>
+                        <div className="settings-input">{cdata.clientid}</div>
+                    </div>
+                    <div className="settings-field">
+                        <div className="settings-label">Client Version</div>
+                        <div className="settings-input">
+                            {VERSION} {BUILD}
+                        </div>
+                    </div>
+                    <div className="settings-field">
+                        <div className="settings-label">DB Version</div>
+                        <div className="settings-input">{cdata.dbversion}</div>
+                    </div>
+                    <div className="settings-field">
+                        <div className="settings-label">Basic Telemetry</div>
+                        <div className="settings-input">
+                            <Toggle checked={!cdata.clientopts.notelemetry} onChange={this.handleChangeTelemetry} />
+                        </div>
+                    </div>
+                    <div className="settings-field">
+                        <div className="settings-label">Check for Updates</div>
+                        <div className="settings-input">
+                            <Toggle
+                                checked={!cdata.clientopts.noreleasecheck}
+                                onChange={this.handleChangeReleaseCheck}
+                            />
+                        </div>
+                    </div>
+                    <div className="settings-field">
+                        <div className="settings-label">OpenAI Token</div>
+                        <div className="settings-input">
+                            <InlineSettingsTextEdit
+                                placeholder=""
+                                text={apiTokenStr}
+                                value={""}
+                                onChange={this.inlineUpdateOpenAIToken}
+                                maxLength={100}
+                                showIcon={true}
+                            />
+                        </div>
+                    </div>
+                    <div className="settings-field">
+                        <div className="settings-label">OpenAI Model</div>
+                        <div className="settings-input">
+                            <InlineSettingsTextEdit
+                                placeholder="gpt-3.5-turbo"
+                                text={isBlank(openAIOpts.model) ? "gpt-3.5-turbo" : openAIOpts.model}
+                                value={openAIOpts.model ?? ""}
+                                onChange={this.inlineUpdateOpenAIModel}
+                                maxLength={100}
+                                showIcon={true}
+                            />
+                        </div>
+                    </div>
+                    <div className="settings-field">
+                        <div className="settings-label">OpenAI MaxTokens</div>
+                        <div className="settings-input">
+                            <InlineSettingsTextEdit
+                                placeholder=""
+                                text={maxTokensStr}
+                                value={maxTokensStr}
+                                onChange={this.inlineUpdateOpenAIMaxTokens}
+                                maxLength={10}
+                                showIcon={true}
+                            />
+                        </div>
+                    </div>
+                    <SettingsError errorMessage={this.errorMessage} />
+                </div>
+            </div>
+        );
+    }
+}
+
+export { ClientSettingsView };

src/app/common/common.less

@@ -407,9 +407,7 @@
     }
     
     pre.selected {
-        border-style: solid;
-        outline-width: 2px;
-        border-color: @term-green; 
+        outline: 2px solid @term-green;
     }
 
     .title.is-1 {
@@ -1158,3 +1156,18 @@
         }
     }
 }
+
+.status-indicator {
+    position: relative;
+    top: 1px;
+
+    &.error {
+        color: @term-red;
+    }
+    &.success {
+        color: @term-green;
+    }
+    &.output {
+        color: @term-white;
+    }
+}

src/app/common/common.tsx

@@ -9,9 +9,10 @@ import ReactMarkdown from "react-markdown";
 import remarkGfm from "remark-gfm";
 import cn from "classnames";
 import { If } from "tsx-control-statements/components";
-import type { RemoteType } from "../../types/types";
+import { RemoteType, StatusIndicatorLevel } from "../../types/types";
 import ReactDOM from "react-dom";
 import { GlobalModel } from "../../model/model";
+import * as appconst from "../appconst";
 
 import { ReactComponent as CheckIcon } from "../assets/icons/line/check.svg";
 import { ReactComponent as CopyIcon } from "../assets/icons/history/copy.svg";
@@ -829,10 +830,7 @@ function CodeRenderer(props: any): any {
 }
 
 @mobxReact.observer
-class CodeBlockMarkdown extends React.Component<
-    { children: React.ReactNode; blockText: string; codeSelectSelectedIndex?: number },
-    {}
-> {
+class CodeBlockMarkdown extends React.Component<{ children: React.ReactNode; codeSelectSelectedIndex?: number }, {}> {
     blockIndex: number;
     blockRef: React.RefObject<HTMLPreElement>;
 
@@ -843,7 +841,6 @@ class CodeBlockMarkdown extends React.Component<
     }
 
     render() {
-        let codeText = this.props.blockText;
         let clickHandler: (e: React.MouseEvent<HTMLElement>, blockIndex: number) => void;
         let inputModel = GlobalModel.inputModel;
         clickHandler = (e: React.MouseEvent<HTMLElement>, blockIndex: number) => {
@@ -868,19 +865,15 @@ class Markdown extends React.Component<
     {}
 > {
     CodeBlockRenderer(props: any, codeSelect: boolean, codeSelectIndex: number): any {
-        let codeText = codeSelect ? props.node.children[0].children[0].value : props.children;
-        if (codeText) {
-            codeText = codeText.replace(/\n$/, ""); // remove trailing newline
-        }
         if (codeSelect) {
-            return (
-                <CodeBlockMarkdown blockText={codeText} codeSelectSelectedIndex={codeSelectIndex}>
-                    {props.children}
-                </CodeBlockMarkdown>
-            );
+            return <CodeBlockMarkdown codeSelectSelectedIndex={codeSelectIndex}>{props.children}</CodeBlockMarkdown>;
         } else {
             let clickHandler = (e: React.MouseEvent<HTMLElement>) => {
-                navigator.clipboard.writeText(codeText);
+                let blockText = (e.target as HTMLElement).innerText;
+                if (blockText) {
+                    blockText = blockText.replace(/\n$/, ""); // remove trailing newline
+                    navigator.clipboard.writeText(blockText);
+                }
             };
             return <pre onClick={(event) => clickHandler(event)}>{props.children}</pre>;
         }
@@ -1246,6 +1239,59 @@ class Modal extends React.Component<ModalProps> {
     }
 }
 
+interface StatusIndicatorProps {
+    level: StatusIndicatorLevel;
+    className?: string;
+}
+
+class StatusIndicator extends React.Component<StatusIndicatorProps> {
+    render() {
+        const statusIndicatorLevel = this.props.level;
+        let statusIndicator = null;
+        if (statusIndicatorLevel != StatusIndicatorLevel.None) {
+            let statusIndicatorClass = null;
+            switch (statusIndicatorLevel) {
+                case StatusIndicatorLevel.Output:
+                    statusIndicatorClass = "output";
+                    break;
+                case StatusIndicatorLevel.Success:
+                    statusIndicatorClass = "success";
+                    break;
+                case StatusIndicatorLevel.Error:
+                    statusIndicatorClass = "error";
+                    break;
+            }
+            statusIndicator = (
+                <div
+                    className={`${this.props.className} fa-sharp fa-solid fa-circle-small status-indicator ${statusIndicatorClass}`}
+                ></div>
+            );
+        }
+        return statusIndicator;
+    }
+}
+
+function ShowWaveShellInstallPrompt(callbackFn: () => void) {
+    let message: string = `
+In order to use Wave's advanced features like unified history and persistent sessions, Wave installs a small, open-source helper program called WaveShell on your remote machine.  WaveShell does not open any external ports and only communicates with your *local* Wave terminal instance over ssh.  For more information please see [the docs](https://docs.waveterm.dev/reference/waveshell).        
+        `;
+    message = message.trim();
+    let prtn = GlobalModel.showAlert({
+        message: message,
+        confirm: true,
+        markdown: true,
+        confirmflag: appconst.ConfirmKey_HideShellPrompt,
+    });
+    prtn.then((confirm) => {
+        if (!confirm) {
+            return;
+        }
+        if (callbackFn) {
+            callbackFn();
+        }
+    });
+}
+
 export {
     CmdStrCode,
     Toggle,
@@ -1267,4 +1313,6 @@ export {
     LinkButton,
     Status,
     Modal,
+    StatusIndicator,
+    ShowWaveShellInstallPrompt,
 };

src/app/common/modals/createremoteconn.tsx

@@ -8,7 +8,7 @@ import { boundMethod } from "autobind-decorator";
 import { If } from "tsx-control-statements/components";
 import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../../model/model";
 import * as T from "../../../types/types";
-import { Modal, TextField, NumberField, InputDecoration, Dropdown, PasswordField, Tooltip } from "../common";
+import { Modal, TextField, NumberField, InputDecoration, Dropdown, PasswordField, Tooltip, ShowWaveShellInstallPrompt } from "../common";
 import * as util from "../../../util/util";
 import * as appconst from "../../appconst";
 
@@ -25,6 +25,7 @@ class CreateRemoteConnModal extends React.Component<{}, {}> {
     tempConnectMode: OV<string>;
     tempPassword: OV<string>;
     tempKeyFile: OV<string>;
+    tempShellPref: OV<string>;
     errorStr: OV<string>;
     remoteEdit: T.RemoteEditType;
     model: RemotesModel;
@@ -40,6 +41,7 @@ class CreateRemoteConnModal extends React.Component<{}, {}> {
         this.tempConnectMode = mobx.observable.box("auto", { name: "CreateRemote-connectMode" });
         this.tempKeyFile = mobx.observable.box("", { name: "CreateRemote-keystr" });
         this.tempPassword = mobx.observable.box("", { name: "CreateRemote-password" });
+        this.tempShellPref = mobx.observable.box("detect", { name: "CreateRemote-shellPref" });
         this.errorStr = mobx.observable.box(this.remoteEdit?.errorstr ?? null, { name: "CreateRemote-errorStr" });
     }
 
@@ -67,23 +69,7 @@ class CreateRemoteConnModal extends React.Component<{}, {}> {
 
     @boundMethod
     handleOk(): void {
-        this.showShellPrompt(this.submitRemote);
-    }
-
-    @boundMethod
-    showShellPrompt(cb: () => void): void {
-        let prtn = GlobalModel.showAlert({
-            message:
-                "You are about to install WaveShell on a remote machine. Please be aware that WaveShell will be executed on the remote system.",
-            confirm: true,
-            confirmflag: appconst.ConfirmKey_HideShellPrompt,
-        });
-        prtn.then((confirm) => {
-            if (!confirm) {
-                return;
-            }
-            cb();
-        });
+        ShowWaveShellInstallPrompt(this.submitRemote);
     }
 
     @boundMethod
@@ -121,6 +107,7 @@ class CreateRemoteConnModal extends React.Component<{}, {}> {
             kwargs["password"] = "";
         }
         kwargs["connectmode"] = this.tempConnectMode.get();
+        kwargs["shellpref"] = this.tempShellPref.get();
         kwargs["visual"] = "1";
         kwargs["submit"] = "1";
         let prtn = GlobalCommandRunner.createRemote(cname, kwargs, false);
@@ -174,6 +161,13 @@ class CreateRemoteConnModal extends React.Component<{}, {}> {
         })();
     }
 
+    @boundMethod
+    handleChangeShellPref(value: string): void {
+        mobx.action(() => {
+            this.tempShellPref.set(value);
+        })();
+    }
+
     @boundMethod
     handleChangePort(value: string): void {
         mobx.action(() => {
@@ -357,6 +351,20 @@ class CreateRemoteConnModal extends React.Component<{}, {}> {
                             }}
                         />
                     </div>
+                    <div className="shellpref-section">
+                        <Dropdown
+                            label="Shell Preference"
+                            options={[
+                                { value: "detect", label: "detect" },
+                                { value: "bash", label: "bash" },
+                                { value: "zsh", label: "zsh" },
+                            ]}
+                            value={this.tempShellPref.get()}
+                            onChange={(val: string) => {
+                                this.tempShellPref.set(val);
+                            }}
+                        />
+                    </div>
                     <If condition={!util.isBlank(this.getErrorStr() as string)}>
                         <div className="settings-field settings-error">Error: {this.getErrorStr()}</div>
                     </If>

src/app/common/modals/editremoteconn.tsx

@@ -24,6 +24,7 @@ class EditRemoteConnModal extends React.Component<{}, {}> {
     tempPassword: OV<string>;
     tempConnectMode: OV<string>;
     tempAuthMode: OV<string>;
+    tempShellPref: OV<string>;
     model: RemotesModel;
 
     constructor(props: { remotesModel?: RemotesModel }) {
@@ -34,6 +35,7 @@ class EditRemoteConnModal extends React.Component<{}, {}> {
         this.tempKeyFile = mobx.observable.box(null, { name: "EditRemoteSettings-tempKeyFile" });
         this.tempPassword = mobx.observable.box(null, { name: "EditRemoteSettings-tempPassword" });
         this.tempConnectMode = mobx.observable.box(null, { name: "EditRemoteSettings-tempConnectMode" });
+        this.tempShellPref = mobx.observable.box(null, { name: "EditRemoteSettings-tempShellPref" });
     }
 
     get selectedRemoteId() {
@@ -52,6 +54,10 @@ class EditRemoteConnModal extends React.Component<{}, {}> {
         return this.model.isAuthEditMode();
     }
 
+    isLocalRemote(): boolean {
+        return this.selectedRemote?.local;
+    }
+
     componentDidMount(): void {
         mobx.action(() => {
             this.tempAlias.set(this.selectedRemote?.remotealias);
@@ -59,6 +65,7 @@ class EditRemoteConnModal extends React.Component<{}, {}> {
             this.tempPassword.set(this.remoteEdit?.haspassword ? PasswordUnchangedSentinel : "");
             this.tempConnectMode.set(this.selectedRemote?.connectmode);
             this.tempAuthMode.set(this.selectedRemote?.authtype);
+            this.tempShellPref.set(this.selectedRemote?.shellpref);
         })();
     }
 
@@ -103,6 +110,13 @@ class EditRemoteConnModal extends React.Component<{}, {}> {
         })();
     }
 
+    @boundMethod
+    handleChangeShellPref(value: string): void {
+        mobx.action(() => {
+            this.tempShellPref.set(value);
+        })();
+    }
+
     @boundMethod
     canResetPw(): boolean {
         if (this.remoteEdit == null) {
@@ -154,6 +168,9 @@ class EditRemoteConnModal extends React.Component<{}, {}> {
         if (!util.isStrEq(this.tempConnectMode.get(), this.selectedRemote?.connectmode)) {
             kwargs["connectmode"] = this.tempConnectMode.get();
         }
+        if (!util.isStrEq(this.tempShellPref.get(), this.selectedRemote?.shellpref)) {
+            kwargs["shellpref"] = this.tempShellPref.get();
+        }
         kwargs["visual"] = "1";
         kwargs["submit"] = "1";
         GlobalCommandRunner.editRemote(this.selectedRemote?.remoteid, kwargs);
@@ -183,11 +200,150 @@ class EditRemoteConnModal extends React.Component<{}, {}> {
         return null;
     }
 
-    render() {
+    renderAlias() {
+        return (
+            <div className="alias-section">
+                <TextField
+                    label="Alias"
+                    onChange={this.handleChangeAlias}
+                    value={this.tempAlias.get()}
+                    maxLength={100}
+                    decoration={{
+                        endDecoration: (
+                            <InputDecoration>
+                                <Tooltip
+                                    message={`(Optional) A short alias to use when selecting or displaying this connection.`}
+                                    icon={<i className="fa-sharp fa-regular fa-circle-question" />}
+                                >
+                                    <i className="fa-sharp fa-regular fa-circle-question" />
+                                </Tooltip>
+                            </InputDecoration>
+                        ),
+                    }}
+                />
+            </div>
+        );
+    }
+
+    renderConnectMode() {
+        return (
+            <div className="connectmode-section">
+                <Dropdown
+                    label="Connect Mode"
+                    options={[
+                        { value: "startup", label: "startup" },
+                        { value: "auto", label: "auto" },
+                        { value: "manual", label: "manual" },
+                    ]}
+                    value={this.tempConnectMode.get()}
+                    onChange={this.handleChangeConnectMode}
+                />
+            </div>
+        );
+    }
+
+    renderShellPref() {
+        return (
+            <div className="shellpref-section">
+                <Dropdown
+                    label="Shell Preference"
+                    options={[
+                        { value: "detect", label: "detect" },
+                        { value: "bash", label: "bash" },
+                        { value: "zsh", label: "zsh" },
+                    ]}
+                    value={this.tempShellPref.get()}
+                    onChange={this.handleChangeShellPref}
+                />
+            </div>
+        );
+    }
+
+    renderAuthMode() {
         let authMode = this.tempAuthMode.get();
+        return (
+            <>
+                <div className="authmode-section">
+                    <Dropdown
+                        label="Auth Mode"
+                        options={[
+                            { value: "none", label: "none" },
+                            { value: "key", label: "key" },
+                            { value: "password", label: "password" },
+                            { value: "key+password", label: "key+password" },
+                        ]}
+                        value={this.tempAuthMode.get()}
+                        onChange={this.handleChangeAuthMode}
+                        decoration={{
+                            endDecoration: (
+                                <InputDecoration>
+                                    <Tooltip
+                                        message={
+                                            <ul>
+                                                <li>
+                                                    <b>none</b> - no authentication, or authentication is already
+                                                    configured in your ssh config.
+                                                </li>
+                                                <li>
+                                                    <b>key</b> - use a private key.
+                                                </li>
+                                                <li>
+                                                    <b>password</b> - use a password.
+                                                </li>
+                                                <li>
+                                                    <b>key+password</b> - use a key with a passphrase.
+                                                </li>
+                                            </ul>
+                                        }
+                                        icon={<i className="fa-sharp fa-regular fa-circle-question" />}
+                                    >
+                                        <i className="fa-sharp fa-regular fa-circle-question" />
+                                    </Tooltip>
+                                </InputDecoration>
+                            ),
+                        }}
+                    />
+                </div>
+                <If condition={authMode == "key" || authMode == "key+password"}>
+                    <TextField
+                        label="SSH Keyfile"
+                        placeholder="keyfile path"
+                        onChange={this.handleChangeKeyFile}
+                        value={this.tempKeyFile.get()}
+                        maxLength={400}
+                        required={true}
+                        decoration={{
+                            endDecoration: (
+                                <InputDecoration>
+                                    <Tooltip
+                                        message={`(Required) The path to your ssh key file.`}
+                                        icon={<i className="fa-sharp fa-regular fa-circle-question" />}
+                                    >
+                                        <i className="fa-sharp fa-regular fa-circle-question" />
+                                    </Tooltip>
+                                </InputDecoration>
+                            ),
+                        }}
+                    />
+                </If>
+                <If condition={authMode == "password" || authMode == "key+password"}>
+                    <PasswordField
+                        label={authMode == "password" ? "SSH Password" : "Key Passphrase"}
+                        placeholder="password"
+                        onChange={this.handleChangePassword}
+                        value={this.tempPassword.get()}
+                        maxLength={400}
+                    />
+                </If>
+            </>
+        );
+    }
+
+    render() {
         if (this.remoteEdit === null || !this.isAuthEditMode) {
             return null;
         }
+        let isLocal = this.isLocalRemote();
         return (
             <Modal className="erconn-modal">
                 <Modal.Header title="Edit Connection" onClose={this.model.closeModal} />
@@ -195,110 +351,10 @@ class EditRemoteConnModal extends React.Component<{}, {}> {
                     <div className="name-actions-section">
                         <div className="name text-primary">{util.getRemoteName(this.selectedRemote)}</div>
                     </div>
-                    <div className="alias-section">
-                        <TextField
-                            label="Alias"
-                            onChange={this.handleChangeAlias}
-                            value={this.tempAlias.get()}
-                            maxLength={100}
-                            decoration={{
-                                endDecoration: (
-                                    <InputDecoration>
-                                        <Tooltip
-                                            message={`(Optional) A short alias to use when selecting or displaying this connection.`}
-                                            icon={<i className="fa-sharp fa-regular fa-circle-question" />}
-                                        >
-                                            <i className="fa-sharp fa-regular fa-circle-question" />
-                                        </Tooltip>
-                                    </InputDecoration>
-                                ),
-                            }}
-                        />
-                    </div>
-                    <div className="authmode-section">
-                        <Dropdown
-                            label="Auth Mode"
-                            options={[
-                                { value: "none", label: "none" },
-                                { value: "key", label: "key" },
-                                { value: "password", label: "password" },
-                                { value: "key+password", label: "key+password" },
-                            ]}
-                            value={this.tempAuthMode.get()}
-                            onChange={this.handleChangeAuthMode}
-                            decoration={{
-                                endDecoration: (
-                                    <InputDecoration>
-                                        <Tooltip
-                                            message={
-                                                <ul>
-                                                    <li>
-                                                        <b>none</b> - no authentication, or authentication is already
-                                                        configured in your ssh config.
-                                                    </li>
-                                                    <li>
-                                                        <b>key</b> - use a private key.
-                                                    </li>
-                                                    <li>
-                                                        <b>password</b> - use a password.
-                                                    </li>
-                                                    <li>
-                                                        <b>key+password</b> - use a key with a passphrase.
-                                                    </li>
-                                                </ul>
-                                            }
-                                            icon={<i className="fa-sharp fa-regular fa-circle-question" />}
-                                        >
-                                            <i className="fa-sharp fa-regular fa-circle-question" />
-                                        </Tooltip>
-                                    </InputDecoration>
-                                ),
-                            }}
-                        />
-                    </div>
-                    <If condition={authMode == "key" || authMode == "key+password"}>
-                        <TextField
-                            label="SSH Keyfile"
-                            placeholder="keyfile path"
-                            onChange={this.handleChangeKeyFile}
-                            value={this.tempKeyFile.get()}
-                            maxLength={400}
-                            required={true}
-                            decoration={{
-                                endDecoration: (
-                                    <InputDecoration>
-                                        <Tooltip
-                                            message={`(Required) The path to your ssh key file.`}
-                                            icon={<i className="fa-sharp fa-regular fa-circle-question" />}
-                                        >
-                                            <i className="fa-sharp fa-regular fa-circle-question" />
-                                        </Tooltip>
-                                    </InputDecoration>
-                                ),
-                            }}
-                        />
-                    </If>
-                    <If condition={authMode == "password" || authMode == "key+password"}>
-                        <PasswordField
-                            label={authMode == "password" ? "SSH Password" : "Key Passphrase"}
-                            placeholder="password"
-                            onChange={this.handleChangePassword}
-                            value={this.tempPassword.get()}
-                            maxLength={400}
-                        />
-                    </If>
-                    <div className="connectmode-section">
-                        <Dropdown
-                            label="Connect Mode"
-                            options={[
-                                { value: "startup", label: "startup" },
-                                { value: "auto", label: "auto" },
-                                { value: "manual", label: "manual" },
-                            ]}
-                            value={this.tempConnectMode.get()}
-                            onChange={this.handleChangeConnectMode}
-                        />
-                    </div>
+                    <If condition={!isLocal}>{this.renderAlias()}</If>
+                    <If condition={!isLocal}>{this.renderAuthMode()}</If>
+                    <If condition={!isLocal}>{this.renderConnectMode()}</If>
+                    {this.renderShellPref()}
                     <If condition={!util.isBlank(this.remoteEdit?.errorstr)}>
                         <div className="settings-field settings-error">Error: {this.remoteEdit?.errorstr}</div>
                     </If>

src/app/common/modals/modals.tsx

@@ -24,6 +24,7 @@ import {
     Button,
     Status,
     Checkbox,
+    ShowWaveShellInstallPrompt,
 } from "../common";
 import * as util from "../../../util/util";
 import * as textmeasure from "../../../util/textmeasure";
@@ -549,23 +550,7 @@ class CreateRemoteConnModal extends React.Component<{}, {}> {
 
     @boundMethod
     handleOk(): void {
-        this.showShellPrompt(this.submitRemote);
-    }
-
-    @boundMethod
-    showShellPrompt(cb: () => void): void {
-        let prtn = GlobalModel.showAlert({
-            message:
-                "You are about to install WaveShell on a remote machine. Please be aware that WaveShell will be executed on the remote system.",
-            confirm: true,
-            confirmflag: appconst.ConfirmKey_HideShellPrompt,
-        });
-        prtn.then((confirm) => {
-            if (!confirm) {
-                return;
-            }
-            cb();
-        });
+        ShowWaveShellInstallPrompt(this.submitRemote);
     }
 
     @boundMethod

src/app/common/modals/registry.tsx

@@ -10,7 +10,7 @@ import {
     EditRemoteConnModal,
     TabSwitcherModal,
 } from "../modals";
-import { ScreenSettingsModal, SessionSettingsModal, LineSettingsModal, ClientSettingsModal } from "./settings";
+import { ScreenSettingsModal, SessionSettingsModal, LineSettingsModal } from "./settings";
 import * as constants from "../../appconst";
 
 const modalsRegistry: { [key: string]: () => React.ReactElement } = {
@@ -22,7 +22,6 @@ const modalsRegistry: { [key: string]: () => React.ReactElement } = {
     [constants.SCREEN_SETTINGS]: () => <ScreenSettingsModal />,
     [constants.SESSION_SETTINGS]: () => <SessionSettingsModal />,
     [constants.LINE_SETTINGS]: () => <LineSettingsModal />,
-    [constants.CLIENT_SETTINGS]: () => <ClientSettingsModal />,
     [constants.TAB_SWITCHER]: () => <TabSwitcherModal />,
 };
 

src/app/common/modals/settings.tsx

@@ -17,22 +17,12 @@ import {
     Screen,
     Session,
 } from "../../../model/model";
-import {
-    Toggle,
-    InlineSettingsTextEdit,
-    SettingsError,
-    InfoMessage,
-    Modal,
-    Dropdown,
-    Tooltip,
-    Button,
-} from "../common";
+import { Toggle, InlineSettingsTextEdit, SettingsError, InfoMessage, Modal, Dropdown, Tooltip } from "../common";
 import { LineType, RendererPluginType, ClientDataType, CommandRtnType, RemoteType } from "../../../types/types";
 import { PluginModel } from "../../../plugins/plugins";
 import * as util from "../../../util/util";
 import { commandRtnHandler } from "../../../util/util";
 import { ReactComponent as SquareIcon } from "../../assets/icons/tab/square.svg";
-import { ReactComponent as AngleDownIcon } from "../../assets/icons/history/angle-down.svg";
 import { ReactComponent as GlobeIcon } from "../../assets/icons/globe.svg";
 import { ReactComponent as StatusCircleIcon } from "../../assets/icons/statuscircle.svg";
 

src/app/common/modals/tabswitcher.tsx

@@ -50,27 +50,30 @@ class TabSwitcherModal extends React.Component<{}, {}> {
         let oSessions = GlobalModel.sessionList;
         let oScreens = GlobalModel.screenMap;
         oScreens.forEach((oScreen) => {
+            if (oScreen == null) {
+                return;
+            }
+            if (oScreen.archived.get()) {
+                return;
+            }
             // Find the matching session in the observable array
             let foundSession = oSessions.find((s) => {
-                if (s.sessionId === oScreen.sessionId && s.archived.get() == false) {
-                    return true;
-                }
-                return false;
+                return s.sessionId == oScreen.sessionId && !s.archived.get();
             });
-
-            if (foundSession) {
-                let data: SwitcherDataType = {
-                    sessionName: foundSession.name.get(),
-                    sessionId: foundSession.sessionId,
-                    sessionIdx: foundSession.sessionIdx.get(),
-                    screenName: oScreen.name.get(),
-                    screenId: oScreen.screenId,
-                    screenIdx: oScreen.screenIdx.get(),
-                    icon: this.getTabIcon(oScreen),
-                    color: this.getTabColor(oScreen),
-                };
-                this.options.push(data);
+            if (!foundSession) {
+                return;
             }
+            let data: SwitcherDataType = {
+                sessionName: foundSession.name.get(),
+                sessionId: foundSession.sessionId,
+                sessionIdx: foundSession.sessionIdx.get(),
+                screenName: oScreen.name.get(),
+                screenId: oScreen.screenId,
+                screenIdx: oScreen.screenIdx.get(),
+                icon: this.getTabIcon(oScreen),
+                color: this.getTabColor(oScreen),
+            };
+            this.options.push(data);
         });
 
         mobx.action(() => {

src/app/common/modals/viewremoteconndetail.tsx

@@ -206,7 +206,6 @@ class ViewRemoteConnDetailModal extends React.Component<{}, {}> {
         );
         if (remote.local) {
             installNowButton = <></>;
-            updateAuthButton = <></>;
             cancelInstallButton = <></>;
         }
         if (remote.sshconfigsrc == "sshconfig-import") {
@@ -352,6 +351,10 @@ class ViewRemoteConnDetailModal extends React.Component<{}, {}> {
                             <div className="settings-label">Connect Mode</div>
                             <div className="settings-input">{remote.connectmode}</div>
                         </div>
+                        <div className="settings-field">
+                            <div className="settings-label">Shell Pref</div>
+                            <div className="settings-input">{remote.shellpref}</div>
+                        </div>
                         {this.renderInstallStatus(remote)}
                         <div className="flex-spacer" style={{ minHeight: 20 }} />
                         <div className="status">