bump to v0.6.2

.github/workflows/build-helper.yml

@@ -1,7 +1,7 @@
 name: "Build Helper"
 on: workflow_dispatch
 env:
-    WAVETERM_VERSION: 0.6.1
+    WAVETERM_VERSION: 0.6.2
     GO_VERSION: "1.21.5"
     NODE_VERSION: "21.5.0"
 jobs:

buildres/build-universal.sh

@@ -1,7 +1,7 @@
 #!/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.6.2
 rm -rf temp
 rm -rf builds
 mkdir temp

package.json

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

src/app/common/modals/editremoteconn.less

@@ -20,6 +20,12 @@
                 width: 100%;
             }
 
+            .import-edit-warning {
+                display: flex;
+                flex-direction: row;
+                align-items: flex-start;
+            }
+
             .name-actions-section {
                 margin-bottom: 10px;
                 display: flex;

src/app/common/modals/editremoteconn.tsx

@@ -58,6 +58,10 @@ class EditRemoteConnModal extends React.Component<{}, {}> {
         return this.selectedRemote?.local;
     }
 
+    isImportedRemote(): boolean {
+        return this.selectedRemote?.sshconfigsrc == "sshconfig-import";
+    }
+
     componentDidMount(): void {
         mobx.action(() => {
             this.tempAlias.set(this.selectedRemote?.remotealias);
@@ -259,6 +263,27 @@ class EditRemoteConnModal extends React.Component<{}, {}> {
         );
     }
 
+    renderImportedRemoteEditWarning() {
+        return (
+            <div className="import-edit-warning">
+                <Tooltip
+                    message={
+                        <span>
+                            Most options for connections imported from an ssh config file cannot be edited. For these
+                            changes, you must edit the config file and import it again. The shell preference can be
+                            edited, but will return to the default if you import again. It will stay changed if you
+                            follow <a href="https://docs.waveterm.dev/features/sshconfig-imports">this procedure</a>.
+                        </span>
+                    }
+                    icon={<i className="fa-sharp fa-regular fa-fw fa-triangle-exclamation" />}
+                >
+                    <i className="fa-sharp fa-regular fa-fw fa-triangle-exclamation" />
+                </Tooltip>
+                &nbsp;SSH Config Import Behavior
+            </div>
+        );
+    }
+
     renderAuthMode() {
         let authMode = this.tempAuthMode.get();
         return (
@@ -344,6 +369,7 @@ class EditRemoteConnModal extends React.Component<{}, {}> {
             return null;
         }
         let isLocal = this.isLocalRemote();
+        let isImported = this.isImportedRemote();
         return (
             <Modal className="erconn-modal">
                 <Modal.Header title="Edit Connection" onClose={this.model.closeModal} />
@@ -351,9 +377,10 @@ class EditRemoteConnModal extends React.Component<{}, {}> {
                     <div className="name-actions-section">
                         <div className="name text-primary">{util.getRemoteName(this.selectedRemote)}</div>
                     </div>
-                    <If condition={!isLocal}>{this.renderAlias()}</If>
-                    <If condition={!isLocal}>{this.renderAuthMode()}</If>
-                    <If condition={!isLocal}>{this.renderConnectMode()}</If>
+                    <If condition={!isLocal && !isImported}>{this.renderAlias()}</If>
+                    <If condition={!isLocal && !isImported}>{this.renderAuthMode()}</If>
+                    <If condition={!isLocal && !isImported}>{this.renderConnectMode()}</If>
+                    <If condition={isImported}>{this.renderImportedRemoteEditWarning()}</If>
                     {this.renderShellPref()}
                     <If condition={!util.isBlank(this.remoteEdit?.errorstr)}>
                         <div className="settings-field settings-error">Error: {this.remoteEdit?.errorstr}</div>

src/app/common/modals/modals.tsx

@@ -1026,17 +1026,6 @@ class ViewRemoteConnDetailModal extends React.Component<{}, {}> {
             cancelInstallButton = <></>;
         }
         if (remote.sshconfigsrc == "sshconfig-import") {
-            updateAuthButton = (
-                <Button theme="secondary" disabled={true}>
-                    Edit
-                    <Tooltip
-                        message={`Connections imported from an ssh config file cannot be edited inside waveterm. To edit these, you must edit the config file and import it again.`}
-                        icon={<i className="fa-sharp fa-regular fa-fw fa-ban" />}
-                    >
-                        <i className="fa-sharp fa-regular fa-fw fa-ban" />
-                    </Tooltip>
-                </Button>
-            );
             archiveButton = (
                 <Button theme="secondary" onClick={() => this.clickArchive()}>
                     Delete

src/app/common/modals/viewremoteconndetail.tsx

@@ -209,17 +209,6 @@ class ViewRemoteConnDetailModal extends React.Component<{}, {}> {
             cancelInstallButton = <></>;
         }
         if (remote.sshconfigsrc == "sshconfig-import") {
-            updateAuthButton = (
-                <Button theme="secondary" disabled={true}>
-                    Edit
-                    <Tooltip
-                        message={`Connections imported from an ssh config file cannot be edited inside waveterm. To edit these, you must edit the config file and import it again.`}
-                        icon={<i className="fa-sharp fa-regular fa-fw fa-ban" />}
-                    >
-                        <i className="fa-sharp fa-regular fa-fw fa-ban" />
-                    </Tooltip>
-                </Button>
-            );
             archiveButton = (
                 <Button theme="secondary" onClick={() => this.clickArchive()}>
                     Delete

version.js

@@ -1,2 +1,2 @@
-const VERSION = "v0.6.1";
+const VERSION = "v0.6.2";
 module.exports = VERSION;

waveshell/pkg/shellapi/zshapi.go

@@ -257,10 +257,7 @@ func (z zshShellApi) MakeRcFileStr(pk *packet.RunPacketType) string {
 		}
 		rcBuf.WriteString("\n")
 	}
-	if shellenv.FindVarDecl(varDecls, "ZDOTDIR") == nil {
-		rcBuf.WriteString("unset ZDOTDIR\n")
-		rcBuf.WriteString("\n")
-	}
+	// do NOT unset ZDOTDIR, otherwise initialization will start to read initialization files from ~/ again
 	for _, varName := range ZshUnsetVars {
 		rcBuf.WriteString("unset " + shellescape.Quote(varName) + "\n")
 	}

wavesrv/pkg/cmdrunner/cmdrunner.go

@@ -1420,9 +1420,6 @@ func RemoteSetCommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (ss
 	if err != nil {
 		return nil, err
 	}
-	if ids.Remote.RState.SSHConfigSrc == sstore.SSHConfigSrcTypeImport {
-		return nil, fmt.Errorf("/remote:new cannot update imported remote")
-	}
 	visualEdit := resolveBool(pk.Kwargs["visual"], false)
 	isSubmitted := resolveBool(pk.Kwargs["submit"], false)
 	editArgs, err := parseRemoteEditArgs(false, pk, ids.Remote.MShell.IsLocal())
@@ -1542,6 +1539,7 @@ type HostInfoType struct {
 	SshKeyFile    string
 	ConnectMode   string
 	Ignore        bool
+	ShellPref     string
 }
 
 func createSshImportSummary(changeList map[string][]string) string {
@@ -1637,6 +1635,13 @@ func NewHostInfo(hostName string) (*HostInfoType, error) {
 		connectMode = sstore.ConnectModeManual
 	}
 
+	shellPref := sstore.ShellTypePref_Detect
+	if cfgWaveOptions["shellpref"] == "bash" {
+		shellPref = "bash"
+	} else if cfgWaveOptions["shellpref"] == "zsh" {
+		shellPref = "zsh"
+	}
+
 	outHostInfo := new(HostInfoType)
 	outHostInfo.Host = hostName
 	outHostInfo.User = userName
@@ -1645,6 +1650,7 @@ func NewHostInfo(hostName string) (*HostInfoType, error) {
 	outHostInfo.SshKeyFile = sshKeyFile
 	outHostInfo.ConnectMode = connectMode
 	outHostInfo.Ignore = shouldIgnore
+	outHostInfo.ShellPref = shellPref
 	return outHostInfo, nil
 }
 
@@ -1709,6 +1715,7 @@ func RemoteConfigParseCommand(ctx context.Context, pk *scpacket.FeCommandPacketT
 			if hostInfo.SshKeyFile != "" {
 				editMap[sstore.RemoteField_SSHKey] = hostInfo.SshKeyFile
 			}
+			editMap[sstore.RemoteField_ShellPref] = hostInfo.ShellPref
 			msh := remote.GetRemoteById(previouslyImportedRemote.RemoteId)
 			if msh == nil {
 				remoteChangeList["updateErr"] = append(remoteChangeList["updateErr"], hostInfo.CanonicalName)
@@ -1716,7 +1723,7 @@ func RemoteConfigParseCommand(ctx context.Context, pk *scpacket.FeCommandPacketT
 				continue
 			}
 
-			if msh.Remote.ConnectMode == hostInfo.ConnectMode && msh.Remote.SSHOpts.SSHIdentity == hostInfo.SshKeyFile && msh.Remote.RemoteAlias == hostInfo.Host {
+			if msh.Remote.ConnectMode == hostInfo.ConnectMode && msh.Remote.SSHOpts.SSHIdentity == hostInfo.SshKeyFile && msh.Remote.RemoteAlias == hostInfo.Host && msh.Remote.ShellPref == hostInfo.ShellPref {
 				// silently skip this one. it didn't fail, but no changes were needed
 				continue
 			}
@@ -1753,6 +1760,7 @@ func RemoteConfigParseCommand(ctx context.Context, pk *scpacket.FeCommandPacketT
 				AutoInstall:         true,
 				SSHOpts:             sshOpts,
 				SSHConfigSrc:        sstore.SSHConfigSrcTypeImport,
+				ShellPref:           sstore.ShellTypePref_Detect,
 			}
 			err := remote.AddRemote(ctx, r, false)
 			if err != nil {

wavesrv/pkg/scbase/scbase.go

@@ -35,7 +35,7 @@ const WaveLockFile = "waveterm.lock"
 const WaveDirName = ".waveterm"        // must match emain.ts
 const WaveDevDirName = ".waveterm-dev" // must match emain.ts
 const WaveAppPathVarName = "WAVETERM_APP_PATH"
-const WaveVersion = "v0.6.1"
+const WaveVersion = "v0.6.2"
 const WaveAuthKeyFileName = "waveterm.authkey"
 const MShellVersion = "v0.4.0"