From 9a825761da8f4b3d5ca3dd0319075de477dffc20 Mon Sep 17 00:00:00 2001
From: Mike Sawka <mike.sawka@gmail.com>
Date: Thu, 2 May 2024 16:17:38 -0700
Subject: [PATCH] merge v0.7.4 and v0.7.5 changes back into main (#644)

---
 package.json                                 |  2 +-
 src/app/common/prompt/prompt.tsx             | 20 ++++++++++----------
 src/app/workspace/cmdinput/infomsg.tsx       |  6 +++++-
 src/app/workspace/cmdinput/textareainput.tsx |  5 +++--
 waveshell/pkg/shellapi/zshapi.go             |  2 --
 wavesrv/cmd/main-server.go                   |  1 -
 wavesrv/pkg/remote/remote.go                 |  8 --------
 7 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/package.json b/package.json
index 8b07d5515..5c3f70928 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     },
     "productName": "Wave",
     "description": "An Open-Source, AI-Native, Terminal Built for Seamless Workflows",
-    "version": "0.7.3",
+    "version": "0.7.5",
     "main": "dist/emain.js",
     "license": "Apache-2.0",
     "repository": {
diff --git a/src/app/common/prompt/prompt.tsx b/src/app/common/prompt/prompt.tsx
index b09d56ad2..18b081e27 100644
--- a/src/app/common/prompt/prompt.tsx
+++ b/src/app/common/prompt/prompt.tsx
@@ -172,16 +172,16 @@ class Prompt extends React.Component<
                 </span>
             );
         }
-        if (!isBlank(festate["K8SCONTEXT"])) {
-            const k8sContext = festate["K8SCONTEXT"];
-            const k8sNs = festate["K8SNAMESPACE"];
-            k8sElem = (
-                <span title="k8s context:namespace" className="term-prompt-k8s">
-                    k8s:({k8sContext}
-                    {isBlank(k8sNs) ? "" : ":" + k8sNs}){" "}
-                </span>
-            );
-        }
+        // if (!isBlank(festate["K8SCONTEXT"])) {
+        //     const k8sContext = festate["K8SCONTEXT"];
+        //     const k8sNs = festate["K8SNAMESPACE"];
+        //     k8sElem = (
+        //         <span title="k8s context:namespace" className="term-prompt-k8s">
+        //             k8s:({k8sContext}
+        //             {isBlank(k8sNs) ? "" : ":" + k8sNs}){" "}
+        //         </span>
+        //     );
+        // }
         return (
             <span className={termClassNames}>
                 {remoteElem} {cwdElem} {branchElem} {condaElem} {pythonElem} {k8sElem}
diff --git a/src/app/workspace/cmdinput/infomsg.tsx b/src/app/workspace/cmdinput/infomsg.tsx
index 292dde5ae..3cca1851a 100644
--- a/src/app/workspace/cmdinput/infomsg.tsx
+++ b/src/app/workspace/cmdinput/infomsg.tsx
@@ -64,7 +64,11 @@ class InfoMsg extends React.Component<{}, {}> {
         }
 
         return (
-            <AuxiliaryCmdView title={titleStr} className="cmd-input-info">
+            <AuxiliaryCmdView
+                title={titleStr}
+                className="cmd-input-info"
+                onClose={() => GlobalModel.inputModel.closeAuxView()}
+            >
                 <If condition={infoMsg?.infomsg}>
                     <div key="infomsg" className="info-msg">
                         <If condition={infoMsg.infomsghtml}>
diff --git a/src/app/workspace/cmdinput/textareainput.tsx b/src/app/workspace/cmdinput/textareainput.tsx
index 170b83bed..c202eaafb 100644
--- a/src/app/workspace/cmdinput/textareainput.tsx
+++ b/src/app/workspace/cmdinput/textareainput.tsx
@@ -617,8 +617,9 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
                 }
             }
         }
-
-        const renderCmdInputKeybindings = inputModel.shouldRenderAuxViewKeybindings(null);
+        const renderCmdInputKeybindings =
+            inputModel.shouldRenderAuxViewKeybindings(null) ||
+            inputModel.shouldRenderAuxViewKeybindings(appconst.InputAuxView_Info);
         const renderHistoryKeybindings = inputModel.shouldRenderAuxViewKeybindings(appconst.InputAuxView_History);
         return (
             <div
diff --git a/waveshell/pkg/shellapi/zshapi.go b/waveshell/pkg/shellapi/zshapi.go
index 461543c70..34ac1108f 100644
--- a/waveshell/pkg/shellapi/zshapi.go
+++ b/waveshell/pkg/shellapi/zshapi.go
@@ -531,8 +531,6 @@ for var in "${(@k)dis_functions_source}"; do
 done
 printf "[%SECTIONSEP%]";
 [%GITBRANCH%]
-[%K8SCONTEXT%]
-[%K8SNAMESPACE%]
 printf "[%SECTIONSEP%]";
 print -P "$PS1"
 printf "[%SECTIONSEP%]";
diff --git a/wavesrv/cmd/main-server.go b/wavesrv/cmd/main-server.go
index 0bc6b9441..be98f4cb0 100644
--- a/wavesrv/cmd/main-server.go
+++ b/wavesrv/cmd/main-server.go
@@ -733,7 +733,6 @@ func HandleRunEphemeralCommand(w http.ResponseWriter, r *http.Request) {
 		WriteJsonError(w, fmt.Errorf(ErrorDecodingJson, err))
 		return
 	}
-	log.Printf("Running ephemeral command: %v\n", commandPk)
 
 	if commandPk.EphemeralOpts == nil {
 		commandPk.EphemeralOpts = &ephemeral.EphemeralRunOpts{}
diff --git a/wavesrv/pkg/remote/remote.go b/wavesrv/pkg/remote/remote.go
index 0c0cddb15..f738723af 100644
--- a/wavesrv/pkg/remote/remote.go
+++ b/wavesrv/pkg/remote/remote.go
@@ -1930,10 +1930,6 @@ func RunCommand(ctx context.Context, rcOpts RunCommandOpts, runPacket *packet.Ru
 		return nil, nil, fmt.Errorf("runPacket.StatePtr should not be set, it is set in RunCommand")
 	}
 
-	if rcOpts.EphemeralOpts != nil {
-		log.Printf("[info] running ephemeral command ck: %s\n", runPacket.CK)
-	}
-
 	// pending state command logic
 	// if we are currently running a command that can change the state, we need to wait for it to finish
 	if rcOpts.StatePtr == nil {
@@ -2186,9 +2182,6 @@ func (wsh *WaveshellProc) HandleFeInput(inputPk *scpacket.FeInputPacketType) err
 func (wsh *WaveshellProc) AddRunningCmd(rct *RunCmdType) {
 	wsh.Lock.Lock()
 	defer wsh.Lock.Unlock()
-	if rct.EphemeralOpts != nil {
-		log.Printf("[info] adding ephemeral running command: %s\n", rct.CK)
-	}
 	wsh.RunningCmds[rct.RunPacket.CK] = rct
 }
 
@@ -2596,7 +2589,6 @@ func (wsh *WaveshellProc) handleDataPacket(rct *RunCmdType, dataPk *packet.DataP
 		return
 	}
 	if rct.EphemeralOpts != nil {
-		log.Printf("ephemeral data packet: %s\n", dataPk.CK)
 		// Write to the response writer if it's set
 		if len(realData) > 0 && rct.EphemeralOpts.ExpectsResponse {
 			switch dataPk.FdNum {