Block Level Indicators/Badges, Update TabBar Styling, Add Badges/Flags to Tabs (#3009)

Author: sawka

.roo/rules/rules.md

@@ -84,8 +84,7 @@ The full API is defined in custom.d.ts as type ElectronApi.
 
 - **CRITICAL: Completion format MUST be: "Done: [one-line description]"**
 - **Keep your Task Completed summaries VERY short**
-- **No lengthy pre-completion summaries** - Do not provide detailed explanations of implementation before using attempt_completion
-- **No recaps of changes** - Skip explaining what was done before completion
+- **No double-summarization** - Put your summary ONLY inside attempt_completion. Do not write a summary in the message body AND then repeat it in attempt_completion. One summary, one place.
 - **Go directly to completion** - After making changes, proceed directly to attempt_completion without summarizing
 - The project is currently an un-released POC / MVP. Do not worry about backward compatibility when making changes
 - With React hooks, always complete all hook calls at the top level before any conditional returns (including jotai hook calls useAtom and useAtomValue); when a user explicitly tells you a function handles null inputs, trust them and stop trying to "protect" it with unnecessary checks or workarounds.

cmd/generatego/main-generatego.go

@@ -24,14 +24,15 @@ func GenerateWshClient() error {
 	fmt.Fprintf(os.Stderr, "generating wshclient file to %s\n", WshClientFileName)
 	var buf strings.Builder
 	gogen.GenerateBoilerplate(&buf, "wshclient", []string{
+		"github.com/wavetermdev/waveterm/pkg/aiusechat/uctypes",
+		"github.com/wavetermdev/waveterm/pkg/baseds",
 		"github.com/wavetermdev/waveterm/pkg/telemetry/telemetrydata",
-		"github.com/wavetermdev/waveterm/pkg/wshutil",
-		"github.com/wavetermdev/waveterm/pkg/wshrpc",
-		"github.com/wavetermdev/waveterm/pkg/wconfig",
+		"github.com/wavetermdev/waveterm/pkg/vdom",
 		"github.com/wavetermdev/waveterm/pkg/waveobj",
+		"github.com/wavetermdev/waveterm/pkg/wconfig",
 		"github.com/wavetermdev/waveterm/pkg/wps",
-		"github.com/wavetermdev/waveterm/pkg/vdom",
-		"github.com/wavetermdev/waveterm/pkg/aiusechat/uctypes",
+		"github.com/wavetermdev/waveterm/pkg/wshrpc",
+		"github.com/wavetermdev/waveterm/pkg/wshutil",
 	})
 	wshDeclMap := wshrpc.GenerateWshCommandDeclMap()
 	for _, key := range utilfn.GetOrderedMapKeys(wshDeclMap) {

cmd/server/main-server.go

@@ -573,7 +573,11 @@ func main() {
 	blocklogger.InitBlockLogger()
 	jobcontroller.InitJobController()
 	blockcontroller.InitBlockController()
-	wcore.InitTabIndicatorStore()
+	err = wcore.InitBadgeStore()
+	if err != nil {
+		log.Printf("error initializing badge store: %v\n", err)
+		return
+	}
 	go func() {
 		defer func() {
 			panichandler.PanicHandler("GetSystemSummary", recover())

cmd/wsh/cmd/wshcmd-badge.go

@@ -0,0 +1,129 @@
+// Copyright 2026, Command Line Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+package cmd
+
+import (
+	"fmt"
+	"runtime"
+
+	"github.com/google/uuid"
+	"github.com/spf13/cobra"
+	"github.com/wavetermdev/waveterm/pkg/baseds"
+	"github.com/wavetermdev/waveterm/pkg/waveobj"
+	"github.com/wavetermdev/waveterm/pkg/wps"
+	"github.com/wavetermdev/waveterm/pkg/wshrpc"
+	"github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
+	"github.com/wavetermdev/waveterm/pkg/wshutil"
+)
+
+var badgeCmd = &cobra.Command{
+	Use:     "badge [icon]",
+	Short:   "set or clear a block badge",
+	Args:    cobra.MaximumNArgs(1),
+	RunE:    badgeRun,
+	PreRunE: preRunSetupRpcClient,
+}
+
+var (
+	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(&badgeBeep, "beep", false, "play system bell sound")
+	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) {
+	defer func() {
+		sendActivity("badge", rtnErr == nil)
+	}()
+
+	if badgePid > 0 && runtime.GOOS == "windows" {
+		return fmt.Errorf("--pid flag is not supported on Windows")
+	}
+	if badgePid > 0 && !cmd.Flags().Changed("priority") {
+		badgePriority = 5
+	}
+
+	oref, err := resolveBlockArg()
+	if err != nil {
+		return fmt.Errorf("resolving block: %v", err)
+	}
+	if oref.OType != waveobj.OType_Block && oref.OType != waveobj.OType_Tab {
+		return fmt.Errorf("badge oref must be a block or tab (got %q)", oref.OType)
+	}
+
+	var eventData baseds.BadgeEvent
+	eventData.ORef = oref.String()
+
+	if badgeClear {
+		eventData.Clear = true
+	} else {
+		icon := "circle-small"
+		if len(args) > 0 {
+			icon = args[0]
+		}
+		badgeId, err := uuid.NewV7()
+		if err != nil {
+			return fmt.Errorf("generating badge id: %v", err)
+		}
+		eventData.Badge = &baseds.Badge{
+			BadgeId:   badgeId.String(),
+			Icon:      icon,
+			Color:     badgeColor,
+			Priority:  badgePriority,
+			PidLinked: badgePid > 0,
+		}
+	}
+
+	event := wps.WaveEvent{
+		Event:  wps.Event_Badge,
+		Scopes: []string{oref.String()},
+		Data:   eventData,
+	}
+
+	err = wshclient.EventPublishCommand(RpcClient, event, &wshrpc.RpcOpts{NoResponse: true})
+	if err != nil {
+		return fmt.Errorf("publishing badge event: %v", err)
+	}
+
+	if badgeBeep {
+		err = wshclient.ElectronSystemBellCommand(RpcClient, &wshrpc.RpcOpts{Route: "electron"})
+		if err != nil {
+			return fmt.Errorf("playing system bell: %v", err)
+		}
+	}
+
+	if badgePid > 0 && eventData.Badge != nil {
+		conn := RpcContext.Conn
+		if conn == "" {
+			conn = wshrpc.LocalConnName
+		}
+		connRoute := wshutil.MakeConnectionRouteId(conn)
+		watchData := wshrpc.CommandBadgeWatchPidData{
+			Pid:     badgePid,
+			ORef:    *oref,
+			BadgeId: eventData.Badge.BadgeId,
+		}
+		err = wshclient.BadgeWatchPidCommand(RpcClient, watchData, &wshrpc.RpcOpts{Route: connRoute})
+		if err != nil {
+			return fmt.Errorf("watching pid: %v", err)
+		}
+	}
+
+	if badgeClear {
+		fmt.Printf("badge cleared\n")
+	} else {
+		fmt.Printf("badge set\n")
+	}
+	return nil
+}

cmd/wsh/cmd/wshcmd-tabindicator.go

@@ -1,4 +1,4 @@
-// Copyright 2025, Command Line Inc.
+// Copyright 2026, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
 package cmd
@@ -7,7 +7,9 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/google/uuid"
 	"github.com/spf13/cobra"
+	"github.com/wavetermdev/waveterm/pkg/baseds"
 	"github.com/wavetermdev/waveterm/pkg/waveobj"
 	"github.com/wavetermdev/waveterm/pkg/wps"
 	"github.com/wavetermdev/waveterm/pkg/wshrpc"
@@ -16,28 +18,26 @@ import (
 
 var tabIndicatorCmd = &cobra.Command{
 	Use:     "tabindicator [icon]",
-	Short:   "set or clear a tab indicator",
+	Short:   "set or clear a tab indicator (deprecated: use 'wsh badge')",
 	Args:    cobra.MaximumNArgs(1),
 	RunE:    tabIndicatorRun,
 	PreRunE: preRunSetupRpcClient,
 }
 
 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() {
 	rootCmd.AddCommand(tabIndicatorCmd)
 	tabIndicatorCmd.Flags().StringVar(&tabIndicatorTabId, "tabid", "", "tab id (defaults to WAVETERM_TABID)")
 	tabIndicatorCmd.Flags().StringVar(&tabIndicatorColor, "color", "", "indicator color")
-	tabIndicatorCmd.Flags().Float64Var(&tabIndicatorPriority, "priority", 0, "indicator priority")
+	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")
 }
 
@@ -46,6 +46,8 @@ func tabIndicatorRun(cmd *cobra.Command, args []string) (rtnErr error) {
 		sendActivity("tabindicator", rtnErr == nil)
 	}()
 
+	fmt.Fprintf(os.Stderr, "tabindicator is deprecated, use 'wsh badge' instead\n")
+
 	tabId := tabIndicatorTabId
 	if tabId == "" {
 		tabId = os.Getenv("WAVETERM_TABID")
@@ -54,34 +56,39 @@ func tabIndicatorRun(cmd *cobra.Command, args []string) (rtnErr error) {
 		return fmt.Errorf("no tab id specified (use --tabid or set WAVETERM_TABID)")
 	}
 
-	var indicator *wshrpc.TabIndicator
-	if !tabIndicatorClear {
+	oref := waveobj.MakeORef(waveobj.OType_Tab, tabId)
+
+	var eventData baseds.BadgeEvent
+	eventData.ORef = oref.String()
+
+	if tabIndicatorClear {
+		eventData.Clear = true
+	} else {
 		icon := "bell"
 		if len(args) > 0 {
 			icon = args[0]
 		}
-		indicator = &wshrpc.TabIndicator{
-			Icon:         icon,
-			Color:        tabIndicatorColor,
-			Priority:     tabIndicatorPriority,
-			ClearOnFocus: !tabIndicatorPersistent,
+		badgeId, err := uuid.NewV7()
+		if err != nil {
+			return fmt.Errorf("generating badge id: %v", err)
+		}
+		eventData.Badge = &baseds.Badge{
+			BadgeId:  badgeId.String(),
+			Icon:     icon,
+			Color:    tabIndicatorColor,
+			Priority: tabIndicatorPriority,
 		}
-	}
-
-	eventData := wshrpc.TabIndicatorEventData{
-		TabId:     tabId,
-		Indicator: indicator,
 	}
 
 	event := wps.WaveEvent{
-		Event:  wps.Event_TabIndicator,
-		Scopes: []string{waveobj.MakeORef(waveobj.OType_Tab, tabId).String()},
+		Event:  wps.Event_Badge,
+		Scopes: []string{oref.String()},
 		Data:   eventData,
 	}
 
 	err := wshclient.EventPublishCommand(RpcClient, event, &wshrpc.RpcOpts{NoResponse: true})
 	if err != nil {
-		return fmt.Errorf("publishing tab indicator event: %v", err)
+		return fmt.Errorf("publishing badge event: %v", err)
 	}
 
 	if tabIndicatorBeep {

emain/emain-menu.ts

@@ -227,7 +227,7 @@ function makeViewMenu(
             label: "Toggle DevTools",
             accelerator: devToolsAccel,
             click: (_, window) => {
-                let wc = getWindowWebContents(window) ?? webContents;
+                const wc = getWindowWebContents(window) ?? webContents;
                 wc?.toggleDevTools();
             },
         },

eslint.config.js

@@ -76,8 +76,9 @@ export default [
             "@typescript-eslint/no-unused-vars": [
                 "warn",
                 {
-                    argsIgnorePattern: "^_[a-z0-9]*$",
-                    varsIgnorePattern: "^_[a-z0-9]*$",
+                    argsIgnorePattern: "^(_[a-zA-Z0-9_]*|e|get)$",
+                    varsIgnorePattern: "^(_[a-zA-Z0-9_]*|dlog|e)$",
+                    caughtErrorsIgnorePattern: "^(_[a-zA-Z0-9_]*|e)$",
                 },
             ],
             "prefer-const": "warn",