From f8abfcb5632bcfd8da0bfcb3072d0f6945fb85df Mon Sep 17 00:00:00 2001
From: sawka <mike.sawka@gmail.com>
Date: Mon, 13 Mar 2023 12:23:36 -0700
Subject: [PATCH] bug fixes

---
 pkg/cmdrunner/cmdrunner.go | 1 +
 pkg/sstore/dbops.go        | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkg/cmdrunner/cmdrunner.go b/pkg/cmdrunner/cmdrunner.go
index a6f4d28e..29e97303 100644
--- a/pkg/cmdrunner/cmdrunner.go
+++ b/pkg/cmdrunner/cmdrunner.go
@@ -534,6 +534,7 @@ func ScreenSetCommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (ss
 		if focusVal != sstore.ScreenFocusInput && focusVal != sstore.ScreenFocusCmd && focusVal != sstore.ScreenFocusCmdFg {
 			return nil, fmt.Errorf("/screen:set invalid focus argument %q, must be %s", focusVal, formatStrs([]string{sstore.ScreenFocusInput, sstore.ScreenFocusCmd, sstore.ScreenFocusCmdFg}, "or", false))
 		}
+		varsUpdated = append(varsUpdated, "focus")
 		updateMap[sstore.ScreenField_Focus] = focusVal
 		setNonAnchor = true
 	}
diff --git a/pkg/sstore/dbops.go b/pkg/sstore/dbops.go
index 07fd4bed..885780eb 100644
--- a/pkg/sstore/dbops.go
+++ b/pkg/sstore/dbops.go
@@ -506,6 +506,7 @@ func InsertCloudSession(ctx context.Context, sessionName string, shareMode strin
 // also creates default window, returns sessionId
 // if sessionName == "", it will be generated
 func InsertSessionWithName(ctx context.Context, sessionName string, shareMode string, activate bool) (*ModelUpdate, error) {
+	var newScreen *ScreenType
 	newSessionId := scbase.GenPromptUUID()
 	txErr := WithTx(ctx, func(tx *TxWrap) error {
 		names := tx.SelectStrings(`SELECT name FROM session`)
@@ -514,10 +515,11 @@ func InsertSessionWithName(ctx context.Context, sessionName string, shareMode st
 		query := `INSERT INTO session (sessionid, name, activescreenid, sessionidx, notifynum, archived, archivedts, sharemode)
                                VALUES (?,         ?,    '',             ?,          ?,         0,        0,          'local')`
 		tx.Exec(query, newSessionId, sessionName, maxSessionIdx+1, 0)
-		_, err := InsertScreen(tx.Context(), newSessionId, "", true)
+		screenUpdate, err := InsertScreen(tx.Context(), newSessionId, "", true)
 		if err != nil {
 			return err
 		}
+		newScreen = screenUpdate.Screens[0]
 		if activate {
 			query = `UPDATE client SET activesessionid = ?`
 			tx.Exec(query, newSessionId)
@@ -533,6 +535,7 @@ func InsertSessionWithName(ctx context.Context, sessionName string, shareMode st
 	}
 	update := ModelUpdate{
 		Sessions: []*SessionType{session},
+		Screens:  []*ScreenType{newScreen},
 	}
 	if activate {
 		update.ActiveSessionId = newSessionId
@@ -614,7 +617,7 @@ func fmtUniqueName(name string, defaultFmtStr string, startIdx int, strs []strin
 	}
 }
 
-func InsertScreen(ctx context.Context, sessionId string, origScreenName string, activate bool) (UpdatePacket, error) {
+func InsertScreen(ctx context.Context, sessionId string, origScreenName string, activate bool) (*ModelUpdate, error) {
 	var newScreenId string
 	txErr := WithTx(ctx, func(tx *TxWrap) error {
 		query := `SELECT sessionid FROM session WHERE sessionid = ? AND NOT archived`
@@ -667,7 +670,7 @@ func InsertScreen(ctx context.Context, sessionId string, origScreenName string,
 	if err != nil {
 		return nil, err
 	}
-	update := ModelUpdate{Screens: []*ScreenType{newScreen}}
+	update := &ModelUpdate{Screens: []*ScreenType{newScreen}}
 	if activate {
 		bareSession, err := GetBareSessionById(ctx, sessionId)
 		if err != nil {