remove badge persistence

wavetermdev · sawka · Mar 9, 2026 · Feb 19, 2026 · Feb 20, 2026 · Mar 2, 2026
commit 144db868eab531d98e7089540c7fb2e531d1c717
diff --git a/cmd/wsh/cmd/wshcmd-badge.go b/cmd/wsh/cmd/wshcmd-badge.go
@@ -26,22 +26,20 @@ var badgeCmd = &cobra.Command{
 }
 
 var (
-	badgeColor      string
-	badgePriority   float64
-	badgeClear      bool
-	badgePersistent bool
-	badgeBeep       bool
-	badgePid        int
+	badgeColor    string
+	badgePriority float64
+	badgeClear    bool
+	badgeBeep     bool
+	badgePid      int
 )
 
 func init() {
 	rootCmd.AddCommand(badgeCmd)
 	badgeCmd.Flags().StringVar(&badgeColor, "color", "", "badge color")
 	badgeCmd.Flags().Float64Var(&badgePriority, "priority", 10, "badge priority")
 	badgeCmd.Flags().BoolVar(&badgeClear, "clear", false, "clear the badge")
-	badgeCmd.Flags().BoolVar(&badgePersistent, "persistent", false, "make badge persistent (survives restarts, default priority 5)")
 	badgeCmd.Flags().BoolVar(&badgeBeep, "beep", false, "play system bell sound")
-	badgeCmd.Flags().IntVar(&badgePid, "pid", 0, "watch a pid and automatically clear the badge when it exits (sets persistent, default priority 5)")
+	badgeCmd.Flags().IntVar(&badgePid, "pid", 0, "watch a pid and automatically clear the badge when it exits (default priority 5)")
 }
 
 func badgeRun(cmd *cobra.Command, args []string) (rtnErr error) {
@@ -52,10 +50,7 @@ func badgeRun(cmd *cobra.Command, args []string) (rtnErr error) {
 	if badgePid > 0 && runtime.GOOS == "windows" {
 		return fmt.Errorf("--pid flag is not supported on Windows")
 	}
-	if badgePid > 0 {
-		badgePersistent = true
-	}
-	if badgePersistent && !cmd.Flags().Changed("priority") {
+	if badgePid > 0 && !cmd.Flags().Changed("priority") {
 		badgePriority = 5
 	}
 
@@ -69,7 +64,6 @@ func badgeRun(cmd *cobra.Command, args []string) (rtnErr error) {
 
 	var eventData baseds.BadgeEvent
 	eventData.ORef = oref.String()
-	eventData.Persistent = badgePersistent
 
 	if badgeClear {
 		eventData.Clear = true

diff --git a/cmd/wsh/cmd/wshcmd-tabindicator.go b/cmd/wsh/cmd/wshcmd-tabindicator.go
@@ -25,12 +25,11 @@ var tabIndicatorCmd = &cobra.Command{
 }
 
 var (
-	tabIndicatorTabId      string
-	tabIndicatorColor      string
-	tabIndicatorPriority   float64
-	tabIndicatorClear      bool
-	tabIndicatorPersistent bool
-	tabIndicatorBeep       bool
+	tabIndicatorTabId    string
+	tabIndicatorColor    string
+	tabIndicatorPriority float64
+	tabIndicatorClear    bool
+	tabIndicatorBeep     bool
 )
 
 func init() {
@@ -39,7 +38,6 @@ func init() {
 	tabIndicatorCmd.Flags().StringVar(&tabIndicatorColor, "color", "", "indicator color")
 	tabIndicatorCmd.Flags().Float64Var(&tabIndicatorPriority, "priority", 10, "indicator priority")
 	tabIndicatorCmd.Flags().BoolVar(&tabIndicatorClear, "clear", false, "clear the indicator")
-	tabIndicatorCmd.Flags().BoolVar(&tabIndicatorPersistent, "persistent", false, "make indicator persistent (don't clear on focus)")
 	tabIndicatorCmd.Flags().BoolVar(&tabIndicatorBeep, "beep", false, "play system bell sound")
 }
 
@@ -62,7 +60,6 @@ func tabIndicatorRun(cmd *cobra.Command, args []string) (rtnErr error) {
 
 	var eventData baseds.BadgeEvent
 	eventData.ORef = oref.String()
-	eventData.Persistent = tabIndicatorPersistent
 
 	if tabIndicatorClear {
 		eventData.Clear = true

diff --git a/frontend/types/gotypes.d.ts b/frontend/types/gotypes.d.ts
@@ -120,7 +120,6 @@ declare global {
     // baseds.BadgeEvent
     type BadgeEvent = {
         oref: string;
-        persistent?: boolean;
         clear?: boolean;
         clearall?: boolean;
         clearbyid?: string;
@@ -134,7 +133,6 @@ declare global {
         stickers?: StickerType[];
         subblockids?: string[];
         jobid?: string;
-        badge?: Badge;
     };
 
     // blockcontroller.BlockControllerRuntimeStatus
@@ -1595,7 +1593,6 @@ declare global {
         name: string;
         layoutstate: string;
         blockids: string[];
-        badge?: Badge;
     };
 
     // waveobj.TermSize

diff --git a/pkg/baseds/baseds.go b/pkg/baseds/baseds.go
@@ -22,10 +22,9 @@ type Badge struct {
 }
 
 type BadgeEvent struct {
-	ORef       string `json:"oref"`
-	Persistent bool   `json:"persistent,omitempty"`
-	Clear      bool   `json:"clear,omitempty"`
-	ClearAll   bool   `json:"clearall,omitempty"`
-	ClearById  string `json:"clearbyid,omitempty"`
-	Badge      *Badge `json:"badge,omitempty"`
+	ORef      string `json:"oref"`
+	Clear     bool   `json:"clear,omitempty"`
+	ClearAll  bool   `json:"clearall,omitempty"`
+	ClearById string `json:"clearbyid,omitempty"`
+	Badge     *Badge `json:"badge,omitempty"`
 }
diff --git a/pkg/waveobj/wtype.go b/pkg/waveobj/wtype.go
@@ -7,8 +7,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"reflect"
-
-	"github.com/wavetermdev/waveterm/pkg/baseds"
 )
 
 type UpdatesRtnType = []WaveObjUpdate
@@ -189,13 +187,12 @@ func (*Workspace) GetOType() string {
 }
 
 type Tab struct {
-	OID         string        `json:"oid"`
-	Version     int           `json:"version"`
-	Name        string        `json:"name"`
-	LayoutState string        `json:"layoutstate"`
-	BlockIds    []string      `json:"blockids"`
-	Meta        MetaMapType   `json:"meta"`
-	Badge       *baseds.Badge `json:"badge,omitempty"`
+	OID         string      `json:"oid"`
+	Version     int         `json:"version"`
+	Name        string      `json:"name"`
+	LayoutState string      `json:"layoutstate"`
+	BlockIds    []string    `json:"blockids"`
+	Meta        MetaMapType `json:"meta"`
 }
 
 func (*Tab) GetOType() string {
@@ -295,7 +292,6 @@ type Block struct {
 	Meta        MetaMapType    `json:"meta"`
 	SubBlockIds []string       `json:"subblockids,omitempty"`
 	JobId       string         `json:"jobid,omitempty"` // if set, the block will render this jobid's pty output
-	Badge       *baseds.Badge  `json:"badge,omitempty"`
 }
 
 func (*Block) GetOType() string {