From 86f3eabf5e2668024c9333eac1f1cb2cfd4dcf92 Mon Sep 17 00:00:00 2001
From: sawka <mike.sawka@gmail.com>
Date: Wed, 31 Aug 2022 12:01:16 -0700
Subject: [PATCH] remote bugfix and filter remotes on client side

---
 pkg/cmdrunner/cmdrunner.go | 22 +---------------------
 pkg/remote/remote.go       |  3 +++
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/pkg/cmdrunner/cmdrunner.go b/pkg/cmdrunner/cmdrunner.go
index 1d42ccb7..332a2c54 100644
--- a/pkg/cmdrunner/cmdrunner.go
+++ b/pkg/cmdrunner/cmdrunner.go
@@ -931,32 +931,12 @@ func HistoryCommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (ssto
 	if err != nil {
 		return nil, err
 	}
-	var filteredItems []*sstore.HistoryItemType
-	for _, hitem := range hitems {
-		if hitem.Remote == ids.Remote.RemotePtr || hitem.IsMetaCmd {
-			filteredItems = append(filteredItems, hitem)
-		}
-	}
-	var buf bytes.Buffer
-	if len(filteredItems) == 0 {
-		buf.WriteString("(no history)")
-	} else {
-		for idx := len(filteredItems) - 1; idx >= 0; idx-- {
-			hitem := filteredItems[idx]
-			hnumStr := hitem.HistoryNum
-			if hitem.IsMetaCmd {
-				hnumStr = "*" + hnumStr
-			}
-			hstr := fmt.Sprintf("%6s  %s\n", hnumStr, hitem.CmdStr)
-			buf.WriteString(hstr)
-		}
-	}
 	show := !resolveBool(pk.Kwargs["noshow"], false)
 	update := &sstore.ModelUpdate{}
 	update.History = &sstore.HistoryInfoType{
 		SessionId: ids.SessionId,
 		WindowId:  ids.WindowId,
-		Items:     filteredItems,
+		Items:     hitems,
 		Show:      show,
 	}
 	return update, nil
diff --git a/pkg/remote/remote.go b/pkg/remote/remote.go
index 6cac6dff..baa3eaaa 100644
--- a/pkg/remote/remote.go
+++ b/pkg/remote/remote.go
@@ -511,6 +511,9 @@ func RunCommand(ctx context.Context, cmdId string, remotePtr sstore.RemotePtrTyp
 		return nil, fmt.Errorf("sending run packet to remote: %w", err)
 	}
 	rtnPk := msh.ServerProc.Output.WaitForResponse(ctx, runPacket.ReqId)
+	if rtnPk == nil {
+		return nil, ctx.Err()
+	}
 	startPk, ok := rtnPk.(*packet.CmdStartPacketType)
 	if !ok {
 		respPk, ok := rtnPk.(*packet.ResponsePacketType)